cpee 1.3.204 → 1.3.205

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf3416bd24525dcf196bc0ae5e8412fe1f61a873
-  data.tar.gz: b2431b2e6f3958fd151447d92d89a2816d710752
+  metadata.gz: 6f2a2070f0a700f8b43054cbd9fcaeed7d761591
+  data.tar.gz: 915c01fb5cfad310d2f51f208049513f40a0358b
 SHA512:
-  metadata.gz: 88128156661f7f2373d9a171f08d43663f36af63e37dd1d87429182af27ab0cd1a7945e4103239cb57ffd808c730b2ae90d1e61f96873d506c51c6b3091ce199
-  data.tar.gz: fd8594f966ec9b6194dc15da32ce39c8409585abd251eba0975de024db2cb2b4cc5afc93e878b4a4b0bae0d3963f07ebd05fc6e95c434d1b13eb153384980922
+  metadata.gz: c30cd2c5277e0c79fe03303ce3c1f90339aa0a38c9deef1637a4dd1e4ccc37d2f521af04d5056da3a7b1fd71f3e55dee1c0e38ff27a0e8199618044ef7579d35
+  data.tar.gz: 40d532eaa4bedf2bf39abf0acdb578f78e3815669e05d3161e664a6a560d15a7ec6eb5a60ea0970092934463721953e92f1fb9fe96f92cd62215448fb81fc014

data/cockpit/css/ui.css

@@ -9,15 +9,16 @@ body {
 
 #instance ui-content { height: 7em; }
 
-#areanew td:nth-child(1)       { width: 7em; padding-right: 2em; }
-#areanew td:nth-child(3)       { width: 16em; padding-left: 2em; }
+#areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }
+#areanew td:nth-child(3)       { width: 16em; padding-left: 1em; }
 #areanew input                 {
   width: 100%;
-  line-height: 1.5em;
-  height: 1.5em;
   padding: 0.1em 0.5em;
   border: 0.1em solid #a1a1a1;
   border-radius: 0;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
 }
 
 #areanew button[name=base]     { width: 100%; padding: 0.5em 1em; margin-bottom: 0.1em; }
@@ -135,6 +136,9 @@ span.vote {
 
 #dat_details { border: 0 none; border-top: 1em solid white; border-bottom: 1em solid white; width: inherit; border-right: 1em solid white; }
 
-#disclaimer { margin: 1em; }
+#disclaimer {
+  padding: 1em;
+  overflow: auto;
+}
 #disclaimer p { max-width: 80ex; text-align: justify; }
 #disclaimer input { margin:0; padding:0; vertical-align:bottom; margin-right: 0.5em; }

data/cockpit/css/wfadaptor.css

@@ -82,6 +82,17 @@ svg .normal {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
+svg .white {
+  fill:#000000;
+  fill-opacity:1;
+  stroke:#ffffff;
+  stroke-width:2.06896567;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
 svg .black {
   fill:#000000;
   fill-opacity:1;
@@ -97,7 +108,8 @@ svg .black {
 svg .clicked {
   fill: grey;
   stroke: grey;
-  filter: drop-shadow(16px 16px 0.5em rgba(0,0,0,0.9));
+  filter: drop-shadow(0 0 0.15em rgba(0,0,0,0.9));
+  padding: 1em;
 }
 
 svg .unknown {

data/cockpit/js/instance.js

@@ -57,9 +57,9 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
 
 $(document).ready(function() {// {{{
   $("input[name=base-url]").val(location.protocol + "//" + location.host + ":" + $('body').data('defaultport'));
-  $("button[name=base]").click(function(){ create_instance(null); });
-  $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance(false); });
-  $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),load_testset); });
+  $("button[name=base]").click(function(){ create_instance(null,false); });
+  $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance(false,false); });
+  $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),function(){ load_testset(false) } ); });
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
   $("button[name=loadmodeltype]").click(function(e){new CustomMenu(e).menu($('#modeltypes'),load_modeltype, $("button[name=loadmodeltype]")); });
@@ -84,18 +84,23 @@ $(document).ready(function() {// {{{
           if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
         });
         ui_activate_tab("#tabexecution");
-        monitor_instance(true);
+        monitor_instance(true,false);
       } else if (q.load) {
         $("#predefinedtestsets div.menuitem").each(function(k,v){
           if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
         });
         ui_activate_tab("#tabexecution");
-        create_instance(q.load);
+        create_instance(q.load,false);
       } else if (q.monitor) {
         $("input[name=instance-url]").val(q.monitor);
         ui_activate_tab("#tabexecution");
-        // ui_toggle_vis_tab($("#instance td.switch"));
-        monitor_instance(false);
+        monitor_instance(false,false);
+      } else if (q.exec) {
+        $("#predefinedtestsets div.menuitem").each(function(k,v){
+          if ($(v).text() == q.exec) { $(v).attr('data-selected','selected'); }
+        });
+        ui_activate_tab("#tabexecution");
+        create_instance(q.exec,true);
       }
     }
   });
@@ -142,7 +147,7 @@ function check_subscription() { // {{{
   }
 }// }}}
 
-function create_instance(ask) {// {{{
+function create_instance(ask,exec) {// {{{
   var info = ask ? ask: prompt("Instance info?", "Enter info here");
   if (info != null) {
     if (info.match(/\S/)) {
@@ -154,7 +159,7 @@ function create_instance(ask) {// {{{
         data: "info=" + info,
         success: function(res){
           $("input[name=instance-url]").val((base + "//" + res + "/").replace(/\/+/g,"/").replace(/:\//,"://"));
-          if (ask) monitor_instance(true);
+          if (ask) monitor_instance(true,exec);
         },
         error: function(a,b,c) {
           alert("No CPEE running.");
@@ -166,7 +171,7 @@ function create_instance(ask) {// {{{
   }
 }// }}}
 
-function monitor_instance(load) {// {{{
+function monitor_instance(load,exec) {// {{{
   var url = $("input[name=instance-url]").val();
 
   $('.tabbehind button').hide();
@@ -255,7 +260,7 @@ function monitor_instance(load) {// {{{
           ws.onclose = function() {
             append_to_log("monitoring", "closed", "server down i assume.");
           };
-          if (load) load_testset();
+          if (load || exec) load_testset(exec);
         }
       });
 
@@ -591,7 +596,8 @@ function save_svg() {// {{{
     }
   });
 }// }}}
-function set_testset(testset) {// {{{
+function set_testset(testset,exec) {// {{{
+  console.log(exec);
   var url = $("#current-instance").text();
 
   $.ajax({
@@ -643,7 +649,10 @@ function set_testset(testset) {// {{{
         type: "PUT",
         url: url + "/properties/values/state",
         data: ({value: res}),
-        error: report_failure
+        error: report_failure,
+        success: function(res){
+          if (exec) start_instance();
+        }
       });
     }
   });
@@ -659,7 +668,7 @@ function load_testsetfile_after() { //{{{
   var files = $('#testsetfile').get(0).files;
   var reader = new FileReader();
   reader.onload = function(){
-    set_testset($.parseXML(reader.result));
+    set_testset($.parseXML(reader.result),false);
     running  = false;
   }
   reader.onerror = function(){ running  = false; }
@@ -694,7 +703,7 @@ function load_modelfile() {// {{{
   document.getElementById('modelfile').click();
 }// }}}
 
-function load_testset() {// {{{
+function load_testset(exec) {// {{{
   if (running) return;
   running  = true;
 
@@ -709,7 +718,7 @@ function load_testset() {// {{{
       $('#dat_details').empty();
 
       document.title = name;
-      set_testset(res);
+      set_testset(res,exec);
     },
     complete: function() {
       running  = false;
@@ -732,7 +741,7 @@ function load_modeltype() {// {{{
         url: url + "/properties/values/attributes/modeltype",
         data: ({value: name}),
         success: function(){
-          set_testset(res);
+          set_testset(res,false);
         },
         error: report_failure
       });

data/cockpit/testsets/Concurrent.xml

@@ -10,24 +10,26 @@
   <endpoints>
     <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
   </endpoints>
-  <description xmlns="http://cpee.org/ns/description/1.0">
-    <parallel>
-      <loop mode="pre_test" condition="data.persons > 0">
-        <parallel_branch pass="data.persons" local="p">
-          <call id="a2" endpoint="bookHotel">
-            <parameters>
-              <method>:post</method>
-              <arguments>
-                <to>"Vienna"</to>
-              </arguments>
-            </parameters>
-            <finalize output="result">data.hotels &lt;&lt; result.value('id')
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <parallel>
+        <loop mode="pre_test" condition="data.persons > 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <arguments>
+                  <to>"Vienna"</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">data.hotels &lt;&lt; result.value('id')
 data.costs += result.value('costs').to_f</finalize>
-          </call>
-        </parallel_branch>
-        <manipulate id="a3">data.persons -= 1</manipulate>
-      </loop>
-    </parallel>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+    </description>
   </description>
   <transformation>
     <description type='copy'/>

data/cockpit/testsets/Lego Crane.xml

@@ -3,7 +3,7 @@
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <movex xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://crane.wst.univie.ac.at:9200/move/x</movex>
+    <movex xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cranex.wst.univie.ac.at:9200/move/x</movex>
     <vacuum xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://crane.wst.univie.ac.at:9200/vacuum</vacuum>
     <movey xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://crane.wst.univie.ac.at:9200/move/y</movey>
   </endpoints>
@@ -110,4 +110,4 @@
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
     <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">default</theme>
   </attributes>
-</testset>
+</testset>

data/cockpit/testsets/Worklist Parallel.xml

@@ -9,78 +9,78 @@
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</cb>
+    <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</worklist>
   </endpoints>
   <positions/>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <parallel svg-label="">
-        <parallel_branch svg-label="">
-          <call id="a2" endpoint="cb" svg-label="">
+      <parallel>
+        <parallel_branch>
+          <call id="a2" endpoint="worklist">
             <parameters>
               <label>"OKA"</label>
               <method>:post</method>
               <arguments>
                 <orgmodel>"organisation1"</orgmodel>
                 <domain>"Virtual Business 1"</domain>
-                <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+                <form>"http://cpee.org/~demo/form/form-f.html"</form>
                 <role>"regular"</role>
                 <schaden>"10001"</schaden>
                 <text>"sehr gut"</text>
               </arguments>
             </parameters>
-            <finalize>data.a = result.value</finalize>
+            <finalize>data.a = result</finalize>
           </call>
         </parallel_branch>
-        <parallel_branch svg-label="">
-          <call id="a3" endpoint="cb" svg-label="">
+        <parallel_branch>
+          <call id="a3" endpoint="worklist">
             <parameters>
               <label>"OKB"</label>
               <method>:post</method>
               <arguments>
                 <orgmodel>"organisation1"</orgmodel>
                 <domain>"Virtual Business 1"</domain>
-                <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+                <form>"http://cpee.org/~demo/form/form-f.html"</form>
                 <role>"regular"</role>
                 <schaden>"12341231"</schaden>
                 <text>"totalo kaputto"</text>
               </arguments>
             </parameters>
-            <finalize>data.b = result.value</finalize>
+            <finalize>data.b = result</finalize>
           </call>
         </parallel_branch>
-        <parallel_branch svg-label="">
-          <call id="a4" endpoint="cb">
+        <parallel_branch>
+          <call id="a4" endpoint="worklist">
             <parameters>
               <label>"OKC"</label>
               <method>:post</method>
               <arguments>
                 <orgmodel>"organisation1"</orgmodel>
                 <domain>"Virtual Business 1"</domain>
-                <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+                <form>"http://cpee.org/~demo/form/form-f.html"</form>
                 <role>"regular"</role>
                 <schaden>"3000"</schaden>
                 <text>"ein Totalschaden"</text>
               </arguments>
             </parameters>
-            <finalize>data.c = result.value</finalize>
+            <finalize>data.c = result</finalize>
           </call>
         </parallel_branch>
       </parallel>
-      <call id="a1" endpoint="cb" svg-label="OK OR NOT OK">
+      <call id="a1" endpoint="worklist">
         <parameters>
           <label>"OK OR NOT OK"</label>
           <method>:post</method>
           <arguments>
             <orgmodel>"organisation1"</orgmodel>
             <domain>"Virtual Business 1"</domain>
-            <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+            <form>"http://cpee.org/~demo/form/form-f.html"</form>
             <role>"regular"</role>
             <schaden>"55546"</schaden>
             <text>"fetzen hin"</text>
           </arguments>
         </parameters>
-        <finalize>data.bla = result.value</finalize>
+        <finalize>data.bla = result</finalize>
       </call>
     </description>
   </description>

data/cockpit/testsets/Worklist Test CPEE.xml

@@ -4,25 +4,25 @@
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9302</cb>
+    <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9302</worklist>
   </endpoints>
   <positions/>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="cb">
+      <call id="a1" endpoint="worklist">
         <parameters>
           <label>"OK OR NOT OK"</label>
           <method>:post</method>
           <arguments>
             <orgmodel>"organisation1"</orgmodel>
             <domain>"Virtual Business 1"</domain>
-            <form>"http://cpee.org/forms/form-f.html"</form>
+            <form>"http://cpee.org/~demo/form/form-f.html"</form>
             <role>"regular"</role>
             <schaden>"55546"</schaden>
             <text>"fetzen hin"</text>
           </arguments>
         </parameters>
-        <manipulate>data.bla = result.value</manipulate>
+        <manipulate>data.bla = result</manipulate>
       </call>
     </description>
   </description>

data/cockpit/testsets/Worklist Test.xml

@@ -4,25 +4,25 @@
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</cb>
+    <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9398</worklist>
   </endpoints>
   <positions/>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="cb">
+      <call id="a1" endpoint="worklist">
         <parameters>
           <label>"OK OR NOT OK"</label>
           <method>:post</method>
           <arguments>
             <orgmodel>"organisation1"</orgmodel>
             <domain>"Virtual Business 1"</domain>
-            <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
-            <role>"regular"</role>
+            <form>"http://cpee.org/~demo/form/form-f.html"</form>
+            <role>"Regular"</role>
             <schaden>"55546"</schaden>
             <text>"fetzen hin"</text>
           </arguments>
         </parameters>
-        <finalize>data.bla = result.value</finalize>
+        <finalize>data.bla = result</finalize>
       </call>
     </description>
   </description>

data/cockpit/testsets/Worklist Test2.xml

@@ -4,26 +4,26 @@
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</cb>
+    <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</worklist>
   </endpoints>
   <positions/>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="cb">
+      <call id="a1" endpoint="worklist">
         <parameters>
           <label>"ROLE and UNIT"</label>
           <method>:post</method>
           <parameters>
             <orgmodel>"organisation1"</orgmodel>
             <domain>"Virtual Business 1"</domain>
-            <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
+            <form>"http://cpee.org/~demo/form/form-f.html"</form>
             <unit>"Workflow Systems and Technology"</unit>
             <role>"Regular"</role>
             <schaden>"55546"</schaden>
             <text>"fetzen hin"</text>
           </parameters>
         </parameters>
-        <finalize>data.bla = result.value</finalize>
+        <finalize>data.bla = result</finalize>
       </call>
     </description>
   </description>