cpee 2.0.20 → 2.0.25

data/cockpit/js/model.js

@@ -1,7 +1,3 @@
-document.addEventListener('graph:changed', function (e) {
-  $("button[name=save]").prop("disabled",false);
-}, false);
-
 $(document).ready(function() {
   $('#tabmodel').click(function(event){
     $('#model ui-behind button:nth-child(1)').addClass('hidden');
@@ -17,25 +13,4 @@ $(document).ready(function() {
     var tab = $(document).find('#model ui-content ui-area:not(.inactive) .relaxngui_table');
         are.animate({ scrollTop: tab.height() }, "slow");
   });
-
-  $("button[name=save]").click(function(){
-    var def = new $.Deferred();
-    def.done(function(name,testset) {
-      $.ajax({
-        url: $('body').attr('current-save') + ($('body').attr('current-save-dir') ? ($('body').attr('current-save-dir') + '/').replace(/\/+/,'/') : '') + name + '.xml',
-        type: 'PUT',
-        contentType: 'application/xml',
-        data: testset.serializePrettyXML(),
-        headers: { 'Content-ID': 'content' },
-        success: function() {
-          $("button[name=save]").prop("disabled",true);
-          $("#lastsavedline").removeClass('hidden');
-          var dt = new Date();
-          var time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
-          $("#lastsaved").text(time);
-        }
-      });
-    });
-    get_testset(def);
-  });
 });

data/cockpit/js/parameters.js

@@ -1,3 +1,5 @@
+var parameters_changed = new Event("parameters:changed", {"bubbles":true, "cancelable":false});
+
 $(document).ready(function() {
   // hook up dataelements with relaxngui //{{{
   $.ajax({
@@ -68,6 +70,7 @@ function do_parameters_save(event) { //{{{
     var url = $('body').attr('current-instance');
     save[visid].set_checkpoint();
     var send = save[visid].save_text();
+    document.dispatchEvent(parameters_changed);
     $.ajax({
       type: "PUT",
       url: url + "/properties/" + visid + "/",

data/cockpit/js/replay.js

@@ -0,0 +1,40 @@
+$(document).ready(function() {
+  $("#replay button").click(e => {
+    $.ajax({
+      url: $('#replay input').val(),
+      type: 'GET',
+      success: function(re) {
+        var de;
+        var ep;
+        var at;
+        var desc;
+        try {
+          jsyaml.loadAll(re,e => {
+            if (e.event && e.event['cpee:lifecycle:transition'] == 'dataelements/change') {
+              de = e.event.data.data_values;
+            }
+            if (e.event && e.event['cpee:lifecycle:transition'] == 'endpoints/change') {
+              ep = e.event.data.data_values;
+            }
+            if (e.event && e.event['cpee:lifecycle:transition'] == 'attributes/change') {
+              at = e.event.data.data_values;
+            }
+            if (e.event && e.event['cpee:description']) {
+              desc = e.event['cpee:description'];
+            }
+            if (e.event && e.event['cpee:state'] == 'running') {
+              throw BreakException;
+            }
+          });
+        } catch(e) { /* just to break out of the iterator. what a shitty language */ }
+      }
+    });
+
+
+    // load log with ajax
+    // extract process model
+    // initialize process model
+    // set attributes
+    // change start button to do replay
+  });
+});

data/cockpit/js/ui.js

@@ -102,3 +102,10 @@ $(document).on('paste', '[contenteditable]', function (e) {
         document.execCommand('insertText', false, content);
     }
 });
+
+// unmark if storage changes. shit has potentially been copied or marked in other tabs.
+$(window).bind('storage', function (e) {
+  if (localStorage.getItem('marked_from') != myid) {
+    save['graph_adaptor'].illustrator.get_elements().removeClass('marked');
+  }
+});

data/cockpit/model.html

@@ -54,8 +54,10 @@
     <script type="text/javascript" src="js/details.js"></script>
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/model.js"></script>
+    <script type="text/javascript" src="js/edit.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="css/model.css" type="text/css"/>
+    <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
     <style>
       /* has to be fucking inline, because firefox and chrome disagree how to handle filter urls */
       /* shit balls, no elegance is left in this world */
@@ -119,7 +121,8 @@
         <ui-tab class="switch"                                               ></ui-tab>
         <ui-tab class=""         data-tab="model"        id="tabmodel"       >Model</ui-tab>
         <ui-tab class="inactive" data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
-        <ui-behind                                                           ><button title='add entry' class="hidden">New</button></ui-behind>
+        <ui-behind                                                           ></ui-behind>
+        <ui-last                                                             ><a class="logo" href=".."></a></ui-last>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="model" id="areamodel"> <!--{{{-->

data/cockpit/replay.html

@@ -0,0 +1,52 @@
+<!--
+  This file is part of CPEE.
+
+  CPEE is free software: you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation,
+  either version 3 of the License, or (at your option) any later version.
+
+  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE (file COPYING in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>CPEE Cockpit</title>
+
+    <!-- libs, do not modify. When local than load local libs. -->
+    <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
+    <script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
+    <script type="text/javascript" src="/js_libs/util.js"></script>
+    <script type="text/javascript" src="/js_libs/printf.js"></script>
+    <script type="text/javascript" src="/js_libs/strftime.min.js"></script>
+    <script type="text/javascript" src="/js_libs/parsequery.js"></script>
+    <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+    <script type="text/javascript" src="/js_libs/js-yaml.min.js"></script>
+
+    <script type="text/javascript" src="/js_libs/ui.js"></script>
+
+    <!-- custom stuff, play arround  -->
+    <script type="text/javascript" src="js/replay.js"></script>
+    <link rel="stylesheet" href="css/ui.css" type="text/css"/>
+    <link rel="stylesheet" href="css/replay.css" type="text/css"/>
+  </head>
+  <body is="x-ui">
+    <div id="replayer">
+      <div id="replay"><span>Replay:</span><input type="text" value="http://localhost/logs/4b92138d-1f68-4d18-b676-92fb1cbe2c78.xes.yaml"/><button>Prepare!</button></div>
+      <iframe id="content" src=""></iframe>
+    </div>
+  </body>
+</html>

data/cockpit/templates/instantiate.local/Take_Sub.xml

@@ -15,7 +15,7 @@
           <method>:post</method>
           <arguments>
             <behavior>wait_running</behavior>
-            <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url
+            <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url>
             <init/>
             <endpoints/>
             <stream/>

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

@@ -26,7 +26,8 @@
       </zeroOrMore>
     </element>
     <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
-      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+
+      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
         <zeroOrMore rngui:label="Add Sensor">
           <element name="sensor">
             <element name="name" rngui:label="Label">
@@ -35,13 +36,18 @@
             <element name="extractor_url" rngui:label="Extractor Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_arg" rngui:label="Extractor Argument">
-              <data type="string" rngui:label="Value / Json"/>
+            <element name="extractor_params" rngui:label="Extractor Arguments:">
+              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
             </element>
             <element name="visualizer_url" rngui:label="Visualizer Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="visualizer_params" rngui:header="Visualizer Arguments">
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
               <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
@@ -52,44 +58,46 @@
           </element>
         </zeroOrMore>
       </element>
-      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Aggregator">
-          <element name="aggregator">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="aggregator_url" rngui:label="Aggregator Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="aggregator_arg" rngui:label="Aggregator Argument">
-              <data type="string" rngui:label="Value / Json"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-      <element name="costs" rngui:header="Costs" rngui:fold="closed">
-        <zeroOrMore rngui:label="Create Cost Factor">
-          <element name="cost_factor">
+
+      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Impact Profile">
+          <element name="ip">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
             <element name="target" rngui:label="Target Value">
               <data type="string" rngui:label="Value"/>
             </element>
-            <element name="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="vfunc_arg" rngui:label="Violation Function Argument">
-              <data type="string" rngui:label="Service Url"/>
+            <element name="ifs" rngui:header="Impact Factors">
+              <zeroOrMore rngui:label="Add Impact Factor">
+                <element name="if">
+                  <element name="ivs" rngui:header="Impact Values">
+                    <zeroOrMore rngui:label="Add Impact Value ">
+                      <element name="iv">
+                        <element name="extractor_url" rngui:label="Extractor Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="aggregator_url" rngui:label="Aggregator Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                      </element>
+                    </zeroOrMore>
+                  </element>
+                  <element name="aggregator_url" rngui:label="Impact Function Url">
+                    <data type="string" rngui:label="Service Url + Parameters"/>
+                  </element>
+                </element>
+              </zeroOrMore>
             </element>
-            <element name="vcost" rngui:label="Violation Cost">
-              <data type="string" rngui:label="Value"/>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url + Parameters"/>
             </element>
           </element>
         </zeroOrMore>
       </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>
@@ -97,21 +105,40 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
-        <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
-      </element>
-      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
-        <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
-      </element>
-      <element name="_timing_min" rngui:label="Min in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
-      <element name="_timing_max" rngui:label="Max in min">
-        <data type="float" rngui:label="Minutes"/>
+      <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
+        <data type="float" rngui:label="[0,1]"/>
       </element>
       <element name="_timing_avg" rngui:label="Avg in min">
         <data type="float" rngui:label="Minutes"/>
       </element>
+      <element name="explanations" rngui:header="Explanations">
+        <zeroOrMore rngui:label="Add Explanation">
+          <element name="explanation">
+            <element name="type" rngui:label="Type">
+              <choice>
+                <value>&gt;</value>
+                <value>&lt;</value>
+              </choice>
+            </element>
+            <element name="deviation" rngui:label="Deviation">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="behaviour" rngui:label="Behaviour">
+              <choice>
+                <value>Immediately</value>
+                <value>Wait until next</value>
+                <value>Use grace period value</value>
+              </choice>
+            </element>
+            <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="text" rngui:label="Explanation">
+              <data type="string" rngui:label="Patterns"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
     </element>
     <element name="_notes" rngui:header="Notes" rngui:fold="closed">
       <element name="_notes_general" rngui:label="General">
@@ -119,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/compact/rngs/callmanipulate.rng

@@ -26,7 +26,8 @@
       </zeroOrMore>
     </element>
     <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
-      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+
+      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
         <zeroOrMore rngui:label="Add Sensor">
           <element name="sensor">
             <element name="name" rngui:label="Label">
@@ -35,8 +36,13 @@
             <element name="extractor_url" rngui:label="Extractor Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_arg" rngui:label="Extractor Argument">
-              <data type="string" rngui:label="Value / Json"/>
+            <element name="extractor_params" rngui:label="Extractor Arguments:">
+              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
             </element>
             <element name="visualizer_url" rngui:label="Visualizer Url">
               <data type="string" rngui:label="Service Url"/>
@@ -52,50 +58,68 @@
           </element>
         </zeroOrMore>
       </element>
-      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Aggregator">
-          <element name="aggregator">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="aggregator_url" rngui:label="Aggregator Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="aggregator_arg" rngui:label="Aggregator Argument">
-              <data type="string" rngui:label="Value / Json"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-      <element name="costs" rngui:header="Costs" rngui:fold="closed">
-        <zeroOrMore rngui:label="Create Cost Factor">
-          <element name="cost_factor">
+
+      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Impact Profile">
+          <element name="ip">
             <element name="name" rngui:label="Label">
               <data type="string" rngui:label="Label"/>
             </element>
             <element name="target" rngui:label="Target Value">
               <data type="string" rngui:label="Value"/>
             </element>
-            <element name="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="vfunc_arg" rngui:label="Violation Function Argument">
-              <data type="string" rngui:label="Service Url"/>
+            <element name="ifs" rngui:header="Impact Factors">
+              <zeroOrMore rngui:label="Add Impact Factor">
+                <element name="if">
+                  <element name="ivs" rngui:header="Impact Values">
+                    <zeroOrMore rngui:label="Add Impact Value ">
+                      <element name="iv">
+                        <element name="extractor_url" rngui:label="Extractor Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="extractor_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                        <element name="aggregator_url" rngui:label="Aggregator Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="aggregator_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                      </element>
+                    </zeroOrMore>
+                  </element>
+                  <element name="aggregator_url" rngui:label="Impact Function Url">
+                    <data type="string" rngui:label="Service Url + Parameters"/>
+                  </element>
+                </element>
+              </zeroOrMore>
             </element>
-            <element name="vcost" rngui:label="Violation Cost">
-              <data type="string" rngui:label="Value"/>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url + Parameters"/>
             </element>
           </element>
         </zeroOrMore>
       </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>
@@ -120,21 +144,40 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+      <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>
       </element>
-      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
-        <data type="float" rngui:label="[0,3,n]"/>
-      </element>
-      <element name="_timing_min" rngui:label="Min in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
-      <element name="_timing_max" rngui:label="Max in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
       <element name="_timing_avg" rngui:label="Avg in min">
         <data type="float" rngui:label="Minutes"/>
       </element>
+      <element name="explanations" rngui:header="Explanations">
+        <zeroOrMore rngui:label="Add Explanation">
+          <element name="explanation">
+            <element name="type" rngui:label="Type">
+              <choice>
+                <value>&gt;</value>
+                <value>&lt;</value>
+              </choice>
+            </element>
+            <element name="deviation" rngui:label="Deviation">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="behaviour" rngui:label="Behaviour">
+              <choice>
+                <value>Immediately</value>
+                <value>Wait until next</value>
+                <value>Use grace period value</value>
+              </choice>
+            </element>
+            <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="text" rngui:label="Explanation">
+              <data type="string" rngui:label="Patterns"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
     </element>
     <element name="_notes" rngui:header="Notes" rngui:fold="closed">
       <element name="_notes_general" rngui:label="General">
@@ -142,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>