cpee 2.0.24 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce85aa02aabbdb513ce56fc7eb7b11878290d2253a4dbad6e4ca0f308c9e4128
-  data.tar.gz: bb30943c2256495cb8346d2ac7808549748deba62aa33d2f15e8582dba55447a
+  metadata.gz: a3830f81020d6eb6b83ac9eba995f7175607f8aee0279b1537e0f5415f3dab21
+  data.tar.gz: a3e1ce78c221dae79d973435cc6997c3dc5e8d00ce8e5cd89634b2648b75012d
 SHA512:
-  metadata.gz: baf7bd6776dd0be3b9c677cd69ca0ece4705550d81ab5ea4f7465ecd087280d726ee96ba9db8c8df0dc365acce52749ca660f3888f1837f92a596d14437b455f
-  data.tar.gz: 77adf09dc7471ff19ec4283cbe9296789085eed108e836589f34b18aed50946b32b24d9f7f9380bfd9f7adc19eab33652af4ef022c8785ae88fd19d07903184d
+  metadata.gz: 56cb04c53af5f2f7eee0c0dcbb83d339a75985e32d7584294f33f5ec755b0d4db9bd4100e0e9c692d921f7bdfe5f60be0a167f7416484ddb6f67d250bb67a013
+  data.tar.gz: de22ffe114afc38010c7650c75e28b067ecec6fec52df16f96f08928a1038634e175636e0cc177d4ecd88ab4de1cc1a99e53a670578041a7f6515ca718c46c7e

data/cockpit/{templates/.CPEE.xml → CPEE.xml}

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<testset>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
   <transformation>
     <description type='copy'/>
     <dataelements type='none'/>

data/cockpit/{templates/.Signavio.xml → Signavio.xml}

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<testset>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
   <transformation>
     <description type='rest'>http://localhost:9295/bpmn2/</description>
     <dataelements type='rest'>http://localhost:9295/bpmn2/</dataelements>

data/cockpit/css/model.css

@@ -23,4 +23,4 @@
 #areamodel div.section:nth-child(4) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
 #areamodel div.section:nth-child(4) button[name=loadmodeltype]   { white-space: normal; width: 10em; height: 2em; }
 
-#model ui-content { height: 6em; }
+#model ui-content { height: 5em; }

data/cockpit/css/ui.css

@@ -121,10 +121,12 @@ ui-tabbed ui-tabbar ui-behind button {
 #areainstance div.section:nth-child(2) { border-left: 1px solid var(--x-ui-border-color); padding: 0 0.5em;     white-space: nowrap; }
 #areainstance div.section:nth-child(3) { border-left: 1px solid var(--x-ui-border-color); padding: 0 0 0 0.5em; white-space: nowrap; }
 
+#areainstance div.section:nth-child(1) > div:nth-child(2)             { white-space: normal; text-align: right; }
+
 #areainstance div.section:nth-child(1) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
 #areainstance div.section:nth-child(1) button                       { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
-#areainstance div.section:nth-child(1) div:nth-child(2)             { white-space: normal; text-align: right; }
 #areainstance div.section:nth-child(1) button[name=loadtestset]     { white-space: normal; width: 10em; height: 3.5em; }
+#areainstance div.section:nth-child(1) button[name=save]            { white-space: normal; width: 10em; height: 3.5em; margin-left: 0.2em; }
 #areainstance div.section:nth-child(1) button[name=loadtestsetfile] { white-space: normal; width: 10em; height: 3.5em; margin-left: 0.2em; }
 #areainstance div.section:nth-child(1) button[name=loadmodelfile]   { white-space: normal; width: 10em; height: 2em;   margin-top: 0.2em; }
 

data/cockpit/edit.html

@@ -0,0 +1,260 @@
+<!--
+  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 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/relaxngui.js"></script>
+
+    <script type="text/javascript" src="/js_libs/ui.js"></script>
+    <script type="text/javascript" src="/js_libs/custommenu.js"></script>
+
+    <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
+
+    <!-- modelling ui -->
+    <script type="text/javascript" src="js/wfadaptor.js"></script>
+    <link rel="stylesheet" href="css/wfadaptor.css" type="text/css"/>
+
+    <!-- custom stuff, play arround  -->
+    <script type="text/javascript" src="js/ui.js"></script>
+    <script type="text/javascript" src="js/instance.js"></script>
+    <script type="text/javascript" src="js/details.js"></script>
+    <script type="text/javascript" src="js/parameters.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="/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 */
+    </style>
+  </head>
+  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
+     <div id='disclaimer' class='hidden'> <!--{{{-->
+       <h1>Disclaimer</h1>
+
+       <p>
+         We use reasonable care in creating and presenting the functionality
+         found in this demonstrator. It is provided purely for demonstration purposes
+         and you should seek further guidance and make independent enquiries
+         before relying upon it.
+       </p>
+
+       <p>
+         All functionality included in this demonstrator is subject to change
+         without notice. We make no representation or warranty whatsoever
+         regarding the completeness, accuracy, adequacy, suitability or
+         operation of this demonstrator, or of the results it produces.
+       </p>
+
+       <p>
+         We assume no responsibility for process instances created with this
+         demonstrator and disclaim all liability arising from negligence or
+         otherwise in respect of such process instances. We will not be liable
+         for any damages (including, without limitation, damages for any
+         consequential loss or loss of business opportunities or projects, or
+         loss of profits) howsoever arising from use of or inability to use
+         this demonstrator, or from any action or omission taken as a result of
+         using this demonstrator.
+       </p>
+
+       <p>
+         This demonstrator was created in Austria. All liability is excluded to the extent
+         permitted by law including any implied terms. Any interpretation of its
+         content, claims or disputes (of whatever nature and not limited to contractual
+         issues) shall be subject to the exclusive jurisdiction of the Austrian Courts
+         under Austrian law.
+       </p>
+
+
+       <p>
+         All actions performed while using this demonstrator will be logged, including
+         the IP address of the user.
+       </p>
+
+       <p>
+         <input id='iagree' type='checkbox'/><label for='iagree'><strong>OK, I Agree with this terms. I will be a happy person, and do no evil.</strong></label>
+       </p>
+       <p>
+        <button id='icontinue' disabled='disabled'>Continue</button>
+       </p>
+    </div> <!--}}}-->
+
+    <div class='hidden' id='relaxngworker'></div>
+
+    <div class='menu' id='templates'></div>
+    <div class='menu' id='modeltypes'></div>
+
+    <ui-tabbed id="instance">
+      <ui-tabbar>
+        <ui-tab class="switch"                                                ></ui-tab>
+        <ui-tab class=""                data-tab="new"       id="tabnew"      >New</ui-tab>
+        <ui-tab class="inactive hidden" data-tab="instance"  id="tabinstance" >Instance</ui-tab>
+        <ui-tab class="inactive hidden" data-tab="execution" id="tabexecution">Execution</ui-tab>
+        <ui-behind                                                            ><a style='display:none' target='_blank' id='current-instance'></a><a style='display:none' target='_blank' id='current-instance-properties'>P</a><a style='display:none' target='_blank' id='current-instance-subscriptions'>S</a><a style='display:none' target='_blank' id='current-instance-callbacks'>C</a></ui-behind>
+        <ui-last                                                              ><a class="logo" href=".."></a></ui-last>
+      </ui-tabbar>
+      <ui-content>
+        <ui-area data-belongs-to-tab="new" id="areanew"> <!--{{{-->
+          <table class='x-ui-layout'>
+          <tr>
+            <td>Resources:</td>
+            <td><input name="res-url" type="text" value=""/></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Engine:</td>
+            <td><input name="base-url" type="text" value=""/></td>
+            <td><button name="base">create new instance</button></td>
+          </tr>
+          <tr>
+            <td>Instance:</td>
+            <td><input name="instance-url" type="text" value=""/></td>
+            <td><button name="instance">monitor instance</button></td>
+          </tr>
+          </table>
+        </ui-area> <!--}}}-->
+        <ui-area data-belongs-to-tab="instance" id="areainstance" class="inactive"> <!--{{{-->
+          <div class='section'>
+            <div>
+              <form id='fuckchrome'>
+                <input type='file' name='testsetfile' id='testsetfile'/>
+              </form>
+              <button title='save a testset includes various settings, subscriptions and a model' name="save" disabled=""><div>save</div><div class="hidden" id='lastsavedline'>(last: <span id="lastsaved"></span>)</div></button>
+              <button title='a testset includes various settings, subscriptions or a model' name="loadtestsetfile">load testset</button>
+            </div>
+            <div>
+              <input type='file' name='modelfile' id='modelfile'/>
+              <button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button>
+            </div>
+          </div><div class='section'>
+            <a id="savetestsetfile" href="" download=""></a>
+            <a id="savesvgfile" href="" download=""></a>
+            <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save testset</button>
+            <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg graph</button>
+          </div><div class='section'>
+            <div>
+              Current model: <span id='currentmodel'></span>
+            </div>
+            <div>
+              <button title='a testset includes various settings, subscriptions and a model' name="loadmodeltype">set model type</button>
+            </div>
+          </div>
+        </ui-area> <!--}}}-->
+        <ui-area data-belongs-to-tab="execution" id="areaexecution" class='inactive'> <!--{{{-->
+          <table class='x-ui-compact'>
+            <tbody class='debug'>
+              <tr>
+                <td>Debugging:</td>
+                <td><input type="checkbox" name="votecontinue"/></td>
+              </tr>
+            </tbody>
+            <tbody class='exe'>
+              <tr>
+                <td>State:</td>
+                <td id='state'>
+                  <span id="state_text"></span>
+                  <span id="state_any" style='display:none'>
+                    <span> ⇒ </span>
+                    <button name="state_start" title='start' style='display:none'>Start</button>
+                    <button name="state_stop" title='stop' style='display:none'>Stop</button>
+                    <span id="state_extended" style='display:none'>
+                      <span> / </span>
+                      <button name="state_abandon" title='abandon' style='display:none'>Abandon</button>
+                    </span>
+                  </span>
+                </td>
+              </tr>
+              <tr>
+                <td>Continue:</td>
+                <td id='votes'></td>
+              </tr>
+            </tbody>
+          </table>
+        </ui-area> <!--}}}-->
+      </ui-content>
+    </ui-tabbed>
+
+    <ui-tabbed class="hidden" id='parameters'>
+      <ui-tabbar>
+        <ui-tab class="switch"                                               ></ui-tab>
+        <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
+        <ui-tab class="inactive" data-tab="endpoints"    id="tabendpoints"   >Endpoints</ui-tab>
+        <ui-tab class="inactive" data-tab="attributes"   id="tabattributes"  >Attributes</ui-tab>
+        <ui-behind                                                           ><button title='add entry'>New</button></ui-behind>
+      </ui-tabbar>
+      <ui-content>
+        <ui-area data-belongs-to-tab="dataelements" id="areadataelements"> <!--{{{-->
+          <div id="dat_dataelements"></div>
+        </ui-area> <!--}}}-->
+        <ui-area data-belongs-to-tab="endpoints" id="areaendpoints" class="inactive"> <!--{{{-->
+          <table id="dat_endpoints"></table>
+        </ui-area> <!--}}}-->
+        <ui-area data-belongs-to-tab="attributes" id="areaattributes" class="inactive"> <!--{{{-->
+          <table id="dat_attributes"></table>
+        </ui-area> <!--}}}-->
+      </ui-content>
+    </ui-tabbed>
+
+    <ui-resizehandle class="hidden">drag to resize</ui-resizehandle>
+
+    <ui-rest id="main" class="hidden">
+      <ui-tabbar>
+        <ui-before                                                 ></ui-before>
+        <ui-tab class=""         data-tab="details" id="tabdetails">Graph</ui-tab>
+        <ui-tab class="inactive" data-tab="dsl"     id="tabdsl"    >Description</ui-tab>
+        <ui-tab class="inactive" data-tab="log"     id="tablog"    >Log</ui-tab>
+        <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'>
+          <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>
+        </ui-area>
+        <ui-resizehandle data-belongs-to-tab="details" data-label="drag to resize"></ui-resizehandle>
+        <ui-area data-belongs-to-tab="details" id="detailcolumn">
+          <div id="dat_details" class='x-ui-layout'></div>
+        </ui-area>
+        <ui-area data-belongs-to-tab="dsl" id="areadsl" class="inactive"></ui-area>
+        <ui-area data-belongs-to-tab="log" id="arealog" class="inactive"> <!--{{{-->
+          <div>Persistent Log: <a style='display:none' target='_blank' id='current-log'></a></div>
+          <table id="dat_log" class="x-ui-layout"></table>
+        </ui-area> <!--}}}-->
+      </ui-content>
+    </ui-rest>
+
+  </body>
+</html>

data/cockpit/index.html

@@ -189,8 +189,6 @@
                     <button name="state_start" title='start' style='display:none'>Start</button>
                     <button name="state_stop" title='stop' style='display:none'>Stop</button>
                     <span id="state_extended" style='display:none'>
-                      <span> / </span>
-                      <button name="state_replay" title='replay' style='display:none'>Replay</button>
                       <span> / </span>
                       <button name="state_abandon" title='abandon' style='display:none'>Abandon</button>
                     </span>

data/cockpit/js/edit.js

@@ -0,0 +1,32 @@
+document.addEventListener('graph:changed', function (e) {
+  $("button[name=save]").prop("disabled",false);
+}, false);
+document.addEventListener('parameters:changed', function (e) {
+  $("button[name=save]").prop("disabled",false);
+}, false);
+
+$(document).ready(function() {
+  $("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);
+        },
+        error: function() {
+          alert('File was moved or deleted. Save testset to disk.');
+        }
+      });
+    });
+    get_testset(def);
+  });
+});

data/cockpit/js/instance.js

@@ -97,12 +97,13 @@ function cockpit() { //{{{
   $("input[name=modelfile]").change(load_modelfile_after);
 
   $.ajax({
-    url: $('body').attr('current-templates') + ".templates.xml",
-    dataType: 'xml',
+    url: $('body').attr('current-templates'),
+    dataType: 'json',
     success: function(res){
-      $('testset',res).each(function(){
-        var ts = $(this).text();
-        $('#templates').append($("<div class='menuitem'></div>").text(ts));
+      $(res).each(function(){
+        if (this.type == 'file') {
+          $('#templates').append($("<div class='menuitem'></div>").text(this.name.replace(/\.xml/,'')));
+        }
       });
       var q = $.parseQuerySimple();
       if (q.min || q.min == "") {
@@ -156,7 +157,7 @@ function cockpit() { //{{{
     }
   });
   $.ajax({
-    url: $('body').attr('current-templates') + ".transformations.xml",
+    url: "transformations.xml",
     dataType: 'xml',
     success: function(res){
       $('transformation',res).each(function(){
@@ -628,8 +629,6 @@ function monitor_instance_state() {// {{{
 }// }}}
 function monitor_instance_transformation() {// {{{
   var url = $('body').attr('current-instance');
-  console.log('hallo');
-  console.log(url);
   $.ajax({
     type: "GET",
     url: url + "/properties/attributes/modeltype/",
@@ -658,17 +657,21 @@ function monitor_instance_pos() {// {{{
 function monitor_instance_running(content,event) {// {{{
   if (save['state'] == "stopping") return;
   if (event == "calling") {
-    save['activity_states'][content.activity_uuid] = true
-    format_visual_add(content.activity,"active")
-  }
-  if (event == "manipulating") {
-    if (!save['activity_states'][content.activity_uuid]) {
+    if (!save['activity_states'][content['activity-uuid']]) {
+      save['activity_states'][content['activity-uuid']] = true
       format_visual_add(content.activity,"active")
     }
-  }
-  if (event == "done") {
-    delete save['activity_states'][content.activity_uuid];
-    format_visual_remove(content.activity,"active")
+  } else if (event == "manipulating") {
+    if (!save['activity_states'][content['activity-uuid']]) {
+      save['activity_states'][content['activity-uuid']] = true
+      format_visual_add(content.activity,"active")
+    }
+  } else if (event == "done") {
+    if (save['activity_states'][content['activity-uuid']]) {
+      save['activity_states'][content['activity-uuid']] = true
+      format_visual_remove(content.activity,"active")
+      setTimeout(() => {delete save['activity_states'][content['activity-uuid']]},5000);
+    }
   }
 } // }}}
 function monitor_instance_state_change(notification) { //{{{
@@ -718,6 +721,8 @@ function monitor_instance_state_change(notification) { //{{{
     // remove all markings with state change
     if (save['graph_adaptor'] && save['graph_adaptor'].illustrator) {
       save['graph_adaptor'].illustrator.get_elements().removeClass('marked');
+      localStorage.removeItem('marked');
+      localStorage.removeItem('marked_from');
     }
 
     if (notification != "ready" && notification != "stopped" && notification != "running") {
@@ -1004,7 +1009,11 @@ function load_testset(exec) {// {{{
   var name = $("#templates div.menuitem[data-selected=selected]").text();
   var url;
   if (name) {
-    url = $('body').attr('current-templates') + name + ".xml";
+    if ($('body').attr('current-templates').match(/\?/)) {
+      url = $('body').attr('current-templates').replace(/\?/,name + '.xml?');
+    } else {
+      url = $('body').attr('current-templates') + name + ".xml";
+    }
   } else {
     if ($('body').attr('load-testset').length > 0) {
       url = $('body').attr('load-testset');
@@ -1038,7 +1047,7 @@ function load_modeltype() {// {{{
   $.ajax({
     cache: false,
     dataType: 'xml',
-    url: $('body').attr('current-templates') + "." + name + ".xml",
+    url: name + ".xml",
     success: function(res){
       $.ajax({
         type: "PUT",