cpee 2.1.51 → 2.1.53

data/cockpit/js/modifiers.js

@@ -7,20 +7,6 @@ $(document).ready(function() {
     clearTimeout(timer);
     timer = setTimeout(function(){ do_mod_save(e.target) }, 5000);
   });
-  $(document).on('change','#modifiers div.additional select',function(e){
-    clearTimeout(timer);
-    do_mod_save(e.target);
-  });
-  $(document).on('blur','#modifiers div.additional input, #modifiers div.additional textarea, #modifiers div.additional [contenteditable]',function(e){
-    clearTimeout(timer);
-    do_mod_save(e.target);
-  });
-  $(document).on('keypress','#modifiers div.additional input',function(e){
-    if (e.keyCode == 13) {
-      clearTimeout(timer);
-      do_mod_save(e.target);
-    }
-  });
   $(document).on('keypress','#modifiers div.additional [contenteditable]',function(e){
     if (e.keyCode == 13) {
       document.execCommand('insertText', false, '\n');
@@ -35,6 +21,10 @@ $(document).ready(function() {
     clearTimeout(timer);
     do_mod_save(e.target);
   });
+  $(document).on('relaxngui_change', '#modifiers div.additional', function(e){
+    clearTimeout(timer);
+    do_mod_save(e.target);
+  });
 });
 
 function do_mod_save(target) {
@@ -61,7 +51,9 @@ async function modifiers_display() {
       url: rep + 'modifiers/'
     }).then(async function(res) {
       let ipromises = [];
+      let iinserts = {};
       $('resource',res).each(function(_,r) {
+        iinserts[$(r).text()] = '';
         ipromises.push(
           $.ajax({
             url: rep + 'modifiers/' + $(r).text()
@@ -87,13 +79,18 @@ async function modifiers_display() {
               );
 
             });
-            $(clone).insertBefore($('#modifiers template'));
+            iinserts[$(r).text()] = $(clone);
 
             await Promise.all(cpromises);
           })
         );
       });
       await Promise.all(ipromises);
+
+      // always insert in order
+      for (const [_, fragment] of Object.entries(iinserts)) {
+        fragment.insertBefore($('#modifiers template'));
+      }
     })
   );
   await Promise.all(promises);

data/cockpit/js/parameters.js

@@ -46,16 +46,6 @@ $(document).ready(function() {
     clearTimeout(timer);
     timer = setTimeout(function(){ do_parameters_save(event); }, 5000);
   });
-  $(document).on('blur','#dat_dataelements input, #dat_endpoints input, #dat_attributes input',function(event){
-    clearTimeout(timer);
-    do_parameters_save(event);
-  }); //}}}
-  $(document).on('keypress','#dat_dataelements input, #dat_endpoints input, #dat_attributes input',function(event){
-    if (event.keyCode == 13) {
-      clearTimeout(timer);
-      do_parameters_save(event);
-    }
-  }); //}}}
   $(document).on('relaxngui_remove', '#dat_dataelements, #dat_endpoints, #dat_attributes', function(event){
     clearTimeout(timer);
     do_parameters_save(event);
@@ -64,6 +54,10 @@ $(document).ready(function() {
     clearTimeout(timer);
     do_parameters_save(event);
   });
+  $(document).on('relaxngui_change', '#dat_dataelements, #dat_endpoints, #dat_attributes', function(event){
+    clearTimeout(timer);
+    do_parameters_save(event);
+  });
 });
 
 function do_parameters_save(event) { //{{{

data/cockpit/js/resources.js

@@ -0,0 +1,16 @@
+$(document).ready(function() {
+  $('.resource-label').on('mouseover',()=>{
+    $('.resource-label').hide(); // Speech Bubble hide when over
+  });
+  $('#graphgrid').on('mouseover','#resources line.resource-line, #resources g polygon.resource-point',(data)=>{
+    const left = $('.resource-label').offset().left;
+    const pos = $(data.target).offset().left - 11;
+    if ($('.resource-label').is(":hidden") || left != pos) {
+      let labeltext = $('text',data.currentTarget).text();
+      $('.resource-label').text(labeltext);
+      $('.resource-label').css('left', pos);
+      $('.resource-label').css('top', data.originalEvent.clientY - 50);
+      $('.resource-label').show();
+    }
+  });
+});

data/cockpit/js/wfadaptor.js

@@ -48,7 +48,7 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
   } // }}}
   this.notify = function() { // public {{{
   } // }}}
-  this.draw_labels = function(max,labels,height_shift,striped){ // public {{{
+  this.draw_labels = function(max,labels,dimensions,striped){ // public {{{
   } // }}}
   this.set_svg_container = function (container) { // {{{
     illustrator.set_svg_container(container); // TODO: shadowing the container element
@@ -376,9 +376,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       }
     }
     if (illustrator.compact == false) {
-      adaptor.draw_labels(graph.max,labels,illustrator.height_shift,illustrator.striped == true ? true : false);
+      adaptor.draw_labels(graph.max,labels,{ 'height': illustrator.height, 'height_shift': illustrator.height_shift },illustrator.striped == true ? true : false);
     } else {
-      adaptor.draw_labels(graph.max,[],illustrator.height_shift,false);
+      adaptor.draw_labels(graph.max,[],{ 'height': illustrator.height, 'height_shift': illustrator.height_shift },false);
     }
     if (illustrator.compact == false) {
       if (labels.length > 0) {

data/cockpit/templates/Coopis 2010.xml

@@ -12,10 +12,14 @@
   </dataelements>
   <endpoints>
     <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <user>https-post://cpee.org/services/timeout-user.php</user>
+    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
     <timeout>https://cpee.org/services/timeout.php</timeout>
     <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
     <subprocess>https://cpee.org/flow/start/url/</subprocess>
     <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+    <send>https-post://cpee.org/ing/correlators/message/send/</send>
+    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
   </endpoints>
   <attributes>
     <theme>extended</theme>
@@ -25,10 +29,13 @@
     <modeltype>CPEE</modeltype>
     <design_stage>development</design_stage>
     <guarded>none</guarded>
-    <design_dir>Templates.dir</design_dir>
+    <design_dir>Experiments.dir/Twin Engine.dir</design_dir>
     <guarded_id/>
     <model_uuid>a1cbb855-90e3-4d8c-b44b-d3ba7bff9f4e</model_uuid>
     <model_version/>
+    <replay>https://cpee.org/replay/</replay>
+    <replay_target>https://cpee.org/replay-data/coopis/1274c1de-286e-4d73-9375-30b363d280fa.xes.yaml</replay_target>
+    <replay_instantiate>https://cpee.org/flow/start/url/</replay_instantiate>
   </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
@@ -134,8 +141,13 @@ data.costs += result.value('costs').to_f</finalize>
           <manipulate id="a3">data.persons -= 1</manipulate>
         </loop>
       </parallel>
-      <choose mode="inclusive">
+      <choose mode="exclusive">
         <alternative condition="data.costs &gt; 700">
+          <_probability>
+            <_probability_min/>
+            <_probability_max/>
+            <_probability_avg/>
+          </_probability>
           <call id="a4" endpoint="approve">
             <parameters>
               <label>Approve Hotel</label>
@@ -173,6 +185,7 @@ data.costs += result.value('costs').to_f</finalize>
             </documentation>
           </call>
         </alternative>
+        <otherwise/>
       </choose>
     </description>
   </description>

data/cockpit/templates/Worklist.xml

@@ -3,13 +3,7 @@
   <executionhandler>ruby</executionhandler>
   <dataelements/>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <subprocess>https-post://cpee.org/flow/start/url/</subprocess>
     <worklist>https-post://cpee.org/worklist/server/</worklist>
-    <send>https-post://cpee.org/ing/correlators/message/send/</send>
-    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
-    <user>https-post://cpee.org/services/timeout-user.php</user>
-    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
   </endpoints>
   <attributes>
     <info>Worklist</info>
@@ -28,9 +22,10 @@
           <label>OK OR NOT OK</label>
           <arguments>
             <orgmodel>https://cpee.org/~demo/orgviz/organisation_informatik.xml</orgmodel>
-            <domain>VirtualBusiness1</domain>
             <form>https://cpee.org/~demo/form/form-f.html</form>
             <role>Assistant</role>
+            <priority>42</priority>
+            <restrictions/>
             <data>
               <schaden>10000</schaden>
               <text>destroyed</text>
@@ -44,11 +39,15 @@
           <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/>

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -96,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -120,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -4,8 +4,8 @@
   </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>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/compact/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/compact/theme.js

@@ -63,6 +63,9 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
+    var focus_ele  = $(':focus',tab);
+    var focus_path = focus_ele.attr('data-relaxngui-path');
+    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
@@ -82,6 +85,13 @@ function WFAdaptorManifestation(adaptor) {
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
       save['details'].content(nn);
+      if (focus_ele.length > 0) {
+        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
+        ele.focus();
+        if (ele.setSelectionRange) {
+          ele.setSelectionRange(focus_pos,focus_pos);
+        }
+      }
       format_visual_forms();
     }
   }; //}}}
@@ -1443,7 +1453,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -96,9 +98,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
@@ -120,9 +122,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

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

@@ -4,8 +4,8 @@
   </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>
+      <value rngui:label='After Last Task in Branch'>last</value>
+      <value rngui:label='After First Task in Branch (Event-Based Gateway)'>first</value>
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">

data/cockpit/themes/control/rngs/start.rng

@@ -29,9 +29,9 @@
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='intrinsic'>Intrinsic</value>
-                <value id='extrinsic'>Extrinsic</value>
-                <value id='separate'>Separate</value>
+                <value rngui:label='Intrinsic'>intrinsic</value>
+                <value rngui:label='Extrinsic'>extrinsic</value>
+                <value rngui:label='Separate'>separate</value>
               </choice>
             </element>
             <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>

data/cockpit/themes/control/theme.js

@@ -63,6 +63,9 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
+    var focus_ele  = $(':focus',tab);
+    var focus_path = focus_ele.attr('data-relaxngui-path');
+    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
@@ -82,6 +85,13 @@ function WFAdaptorManifestation(adaptor) {
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
       save['details'].content(nn);
+      if (focus_ele.length > 0) {
+        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
+        ele.focus();
+        if (ele.setSelectionRange) {
+          ele.setSelectionRange(focus_pos,focus_pos);
+        }
+      }
       format_visual_forms();
     }
   }; //}}}
@@ -1772,7 +1782,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cockpit/themes/dataflow/rngs/alternative.rng

@@ -0,0 +1,25 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label="Min in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_max" rngui:label="Max in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_avg" rngui:label="Avg in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+  </element>
+</element>