cpee 2.0.24 → 2.0.30

data/cockpit/js/details.js

@@ -49,7 +49,6 @@ function do_main_work() { //{{{
   var origtype = orignode.attr('element-type') + '_' + orignode.attr('element-endpoint');
 
   var url = $('body').attr('current-instance');
-  $('#main ui-tabbar ui-behind button').removeClass('highlight');
   save['details'].set_checkpoint();
 
   var nnew = $(save['details'].save().documentElement);

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

@@ -82,7 +82,7 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
 
 function cockpit() { //{{{
   $("button[name=base]").click(function(){ create_instance($("input[name=base-url]").val(),null,false,false); });
-  $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance($("input[name=instance-url]").val(),$("input[name=res-url]").val(),false,false); });
+  $("button[name=instance]").click(function(){ uidash_activate_tab("#tabinstance"); monitor_instance($("input[name=instance-url]").val(),$("input[name=res-url]").val(),false,false); });
   $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#templates'),function(){ load_testset(false) } ); });
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
@@ -97,17 +97,23 @@ 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/,'')));
+        }
       });
+    },
+    error: function() {
+      $("button[name=loadtestset]").attr('disabled','disabled');
+    },
+    complete: function() {
       var q = $.parseQuerySimple();
       if (q.min || q.min == "") {
-        ui_toggle_vis_tab($('#instance'));
-        ui_toggle_vis_tab($('#parameters'));
+        uidash_toggle_vis_tab($('#instance'));
+        uidash_toggle_vis_tab($('#parameters'));
       }
       if (q.monitor && q.load) {
         if (q.load.match(/https?:\/\//)) {
@@ -117,7 +123,7 @@ function cockpit() { //{{{
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         monitor_instance(q.monitor,$("body").attr('current-resources'),true,false);
       } else if (q.load) {
         if (q.load.match(/https?:\/\//)) {
@@ -127,20 +133,20 @@ function cockpit() { //{{{
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.load,true,false);
       } else if (q.instantiate) {
         if (q.instantiate.match(/https?:\/\//)) {
-          ui_activate_tab("#tabexecution");
+          uidash_activate_tab("#tabexecution");
           create_instance_from($("body").attr('current-base'),q.instantiate,false);
         } else {
           alert('Nope. Url!');
         }
       } else if (q.new || q.new == "") {
-        ui_activate_tab("#tabinstance");
+        uidash_activate_tab("#tabinstance");
         create_instance($("body").attr('current-base'),"Plain Instance",false,false);
       } else if (q.monitor) {
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabinstance");
         monitor_instance(q.monitor,$("body").attr('current-resources'),false,false);
       } else if (q.exec) {
         if (q.exec.match(/https?:\/\//)) {
@@ -150,13 +156,13 @@ function cockpit() { //{{{
             if ($(v).text() == q.exec) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.exec,true,true);
       }
     }
   });
   $.ajax({
-    url: $('body').attr('current-templates') + ".transformations.xml",
+    url: "transformations.xml",
     dataType: 'xml',
     success: function(res){
       $('transformation',res).each(function(){
@@ -323,7 +329,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
   $("input[name=instance-url]").val($("body").attr('current-instance'));
   $("input[name=res-url]").val($("body").attr('current-resources'));
 
-  $('.tabbehind button').hide();
+  $('#parameters ui-content ui-area > button').attr('disabled','disabled');
   $('#dat_details').empty();
 
   url = $("body").attr('current-instance');
@@ -379,7 +385,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
     },
     error: function(a,b,c) {
       alert("This ain't no CPEE instance");
-      ui_activate_tab("#tabnew");
+      uidash_activate_tab("#tabnew");
     }
   });
 }// }}}
@@ -628,8 +634,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 +662,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,13 +726,16 @@ 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") {
-      $('.tabbehind button').hide();
+      console.log('rrr');
+      $('#parameters ui-content ui-area > button').attr('disabled','disabled');
       $('#state_any').hide();
     } else {
-      $('#parameters .tabbehind button').show();
+      $('#parameters ui-content ui-area > button').removeAttr('disabled');
       $('#state_any').show();
     }
 
@@ -1004,7 +1015,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');
@@ -1017,7 +1032,6 @@ function load_testset(exec) {// {{{
       url: url,
       success: function(res){
         save['dsl'] = null; // reload dsl and position under all circumstances
-        $('#main .tabbehind button').hide();
         $('#dat_details').empty();
 
         document.title = "Untitled";
@@ -1038,7 +1052,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",
@@ -1201,8 +1215,10 @@ function format_visual_vote_clear() {//{{{
 
 function format_instance_pos() { //{{{
   $(save['instance_pos']).each(function(){
-    var what = this.nodeName;
-    format_visual_add(what,save['state'] == 'running' ? 'active' : 'passive');
+    console.log(this);
+    var taskname = this.nodeName;
+    var taskstate = this.textContent;
+    format_visual_add(taskname,save['state'] == 'running' ? (taskstate == 'at' ? 'active' : 'passive') : 'passive');
   });
 } //}}}
 

data/cockpit/js/model.js

@@ -1,41 +1,11 @@
-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');
-  });
-  $('#tabdataelements').click(function(event){
-    $('#model ui-behind button:nth-child(1)').removeClass('hidden');
-  });
-
-  $('#model ui-behind button:nth-child(1)').click(function(event){
-    var but = $(document).find('#model ui-content ui-area:not(.inactive) button');
+  $('#model ui-content ui-area > button').click(function(event){
+    var but = $(document).find('#model ui-content ui-area:not(.inactive) > div button');
         but.click();
-    var are = $(document).find('#model ui-content ui-area:not(.inactive)');
-    var tab = $(document).find('#model ui-content ui-area:not(.inactive) .relaxngui_table');
+    var inp = $(document).find('#model ui-content ui-area:not(.inactive) > div input');
+        $(inp[inp.length-2]).focus();
+    var are = $(document).find('#model ui-content ui-area:not(.inactive) > div');
+    var tab = $(document).find('#model ui-content ui-area:not(.inactive) > div > div');
         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({
@@ -28,11 +30,13 @@ $(document).ready(function() {
   }); //}}}
 
   // new entry //{{{
-  $('#parameters ui-behind button:nth-child(1)').click(function(event){
-    var but = $(document).find('#parameters ui-content ui-area:not(.inactive) button');
+  $('#parameters ui-content ui-area > button').click(function(event){
+    var but = $(document).find('#parameters ui-content ui-area:not(.inactive) > div button');
         but.click();
-    var are = $(document).find('#parameters ui-content ui-area:not(.inactive)');
-    var tab = $(document).find('#parameters ui-content ui-area:not(.inactive) .relaxngui_table');
+    var inp = $(document).find('#parameters ui-content ui-area:not(.inactive) > div input');
+        $(inp[inp.length-2]).focus();
+    var are = $(document).find('#parameters ui-content ui-area:not(.inactive) > div');
+    var tab = $(document).find('#parameters ui-content ui-area:not(.inactive) > div > div');
         are.animate({ scrollTop: tab.height() }, "slow");
   }); //}}}
 
@@ -68,6 +72,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/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

@@ -36,11 +36,11 @@
 
     <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/uidash.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/uidash.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
@@ -54,6 +54,7 @@
     <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"/>
@@ -62,7 +63,7 @@
       /* 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">
+  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">
      <div id='disclaimer' class='hidden'> <!--{{{-->
        <h1>Disclaimer</h1>
 
@@ -160,6 +161,7 @@
           </div>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="dataelements" id="areadataelements" class="inactive"> <!--{{{-->
+          <button title='add entry'><span>New</span></button>
           <div id="dat_dataelements"></div>
         </ui-area> <!--}}}-->
       </ui-content>

data/cockpit/replay.html

@@ -36,14 +36,15 @@
     <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>
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
+    <link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
 
     <!-- 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">
+  <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>

data/cockpit/templates/Coopis 2010.xml

@@ -73,4 +73,4 @@ data.costs += result.value('costs').to_f</finalize>
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml

@@ -74,4 +74,4 @@
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml

@@ -74,4 +74,4 @@
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml

@@ -74,4 +74,4 @@
     <dataelements type="rest"/>
     <endpoints type="rest"/>
   </transformation>
-</testset>
+</testset>

data/cockpit/templates/Track Test Local.xml

@@ -73,10 +73,14 @@
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>Track Test</info>
+    <info>Track Test Local</info>
     <modeltype>CPEE</modeltype>
     <theme>default</theme>
     <customer>pilotfabrik</customer>
     <status>development</status>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
   </attributes>
-</testset>
+</testset>

data/cockpit/templates/Track Test.xml

@@ -78,5 +78,9 @@
     <theme>default</theme>
     <customer>pilotfabrik</customer>
     <status>development</status>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
   </attributes>
-</testset>
+</testset>