cpee 2.1.91 → 2.1.93

data/cockpit/js/instance.js

@@ -110,6 +110,14 @@ function cockpit() { //{{{
   $("input[name=testsetfile]").change(load_testsetfile_after);
   $("input[name=modelfile]").change(load_modelfile_after);
   $("#modifiers").on('change','div.select select',function(e){ modifiers_update(e); });
+  $("#modelling").click(function(e){
+    $('#graphgrid .selected').removeClass('selected');
+    save['graph_adaptor'].illustrator.get_elements().removeClass('marked');
+    localStorage.removeItem('marked');
+    localStorage.removeItem('marked_from');
+    $('#dat_details').empty();
+    e.stopImmediatePropagation();
+  });
 
   $.ajax({
     url: $('body').attr('current-templates'),
@@ -339,9 +347,9 @@ async function sse() { //{{{
       // setTimeout(sse,10000);
     };
   }
+  await monitor_instance_values("endpoints"); // we cant render before we know specialized endpoint symbols
   await monitor_instance_values("attributes"); // attributes first, to catch the <resources> attribute which overrides current-resources
   monitor_instance_values("dataelements");
-  monitor_instance_values("endpoints");
   monitor_instance_dsl();
   monitor_instance_state();
 } //}}}
@@ -484,37 +492,45 @@ function monitor_instance_values(type,vals) {// {{{
         if (type == "endpoints") {
           save['endpoints_list'] = {};
           var tmp = {};
+          let deferreds = [];
           $(res).find(" > endpoints > *").each(function(k,v) {
             save['endpoints_list'][v.localName] = v.lastChild.nodeValue;
             let rep = $('body').attr('current-resources');
+            let def = new $.Deferred();
+            deferreds.push(def);
             $.ajax({
               url: rep + 'endpoints/' + encodeURIComponent($(v).text()),
-              success: function() {
+              success: () => {
                 tmp[v.tagName] = {};
                 $.when.apply($, get_resource(rep,v.tagName,$(v).text(),tmp)).then(function(x) {
                   save['endpoints_cache'] = tmp;
+                  def.resolve();
                   // when updating attributes clear the attributes, because they might change as well. New arguments are possible.
                   $('#dat_details').empty();
-                  adaptor_update();
                 });
-              }
+              },
+              error: () => { def.resolve() }
             });
             if (save['resources']) {
               let rep = save['resources'];
+              let defr = new $.Deferred();
+              deferreds.push(defr);
               $.ajax({
                 url: rep + 'endpoints/' + encodeURIComponent(encodeURIComponent($(v).text())),
-                success: function() {
+                success: () => {
                   tmp[v.tagName] = {};
                   $.when.apply($, get_resource(rep,v.tagName,encodeURIComponent($(v).text()),tmp)).then(function(x) {
                     save['endpoints_cache'] = tmp;
+                    def.resolve();
                     // when updating attributes clear the attributes, because they might change as well. New arguments are possible.
                     $('#dat_details').empty();
-                    adaptor_update();
                   });
-                }
+                },
+                error: () => { def.resolve() }
               });
             }
           });
+          $.when.apply($, deferreds).done();
         } else if(type == "attributes") {
           $(" > attributes > *",res).each((k,v)=>{
             save['attributes_raw'][v.nodeName] = v.textContent;
@@ -561,17 +577,6 @@ function monitor_instance_values(type,vals) {// {{{
   }
 } // }}}
 
-function adaptor_update() { //{{{
-  $('g.element[element-endpoint]').each(function(k,ele){
-    if (save['endpoints_cache'][$(ele).attr('element-endpoint')] && save['endpoints_cache'][$(ele).attr('element-endpoint')]) {
-      var c = $(ele).find('g.replace');
-      var symbol = save['endpoints_cache'][$(ele).attr('element-endpoint')].symbol;
-      if (symbol) {
-        c.replaceWith($(symbol.documentElement).clone());
-      }
-    }
-  });
-} //}}}
 function adaptor_init(url,theme,dslx) { //{{{
   // while inside and svgs are reloaded, do nothing here
   if (suspended_redrawing) { return; }
@@ -581,10 +586,22 @@ function adaptor_init(url,theme,dslx) { //{{{
     suspended_redrawing = true;
     save['graph_theme'] = theme;
     save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
-      manifestation.endpoints = save.endpoints_list;
-      graphrealization.draw_labels = function(max,labels,dimensions,striped) {
+      graphrealization.illustrator.get_symbol = (target) => { //{{{
+        if (save['endpoints_cache'][target]) {
+          return save['endpoints_cache'][target].symbol;
+        } else {
+          return undefined;
+        }
+      } //}}}
+      graphrealization.illustrator.get_properties = (target) => { //{{{
+        if (save['endpoints_cache'][target]) {
+          return save['endpoints_cache'][target].properties;
+        } else {
+          return undefined;
+        }
+      } //}}}
+      graphrealization.draw_labels = (max,labels,dimensions,striped) => { //{{{
         // highlight
-
         if (graph_highlight) {
           graph_highlight_tasks.forEach((ele) => {
             let er = $('g[element-id=' + ele + ']').attr('element-row');
@@ -695,7 +712,7 @@ function adaptor_init(url,theme,dslx) { //{{{
                   tsvg.text(col.value);
                   tsvg.mouseover(function(ev){ manifestation.events.mouseover($(ev.currentTarget).attr('element-id')); });
                   tsvg.mouseout(function(ev){ manifestation.events.mouseout($(ev.currentTarget).attr('element-id')); });
-                  tsvg.click(function(ev){ manifestation.events.click($(ev.currentTarget).attr('element-id')); });
+                  tsvg.click(function(ev){ manifestation.events.click($(ev.currentTarget).attr('element-id'),ev); });
                   tcolumnsvgs[col.column][val.row] = tsvg;
                 }
 
@@ -751,10 +768,10 @@ function adaptor_init(url,theme,dslx) { //{{{
         // Add the last stripe
         var j = tcolumns.length;
         for (var i = 0; i < max.row; i++) {
-          var ele = $('<div element-row="' + i + '" class="graphlast ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + dimensions.height_shift + 'px">&#032;</div>');
+          var ele = $('<div element-row="' + i + '" class="graphlast ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; height: ' + dimensions.stripe_height + 'px">&#032;</div>');
           $('#graphgrid').append(ele);
         }
-      };
+      }; //}}}
       graphrealization.set_svg_container($('#graphcanvas'));
       graphrealization.set_label_container($('#graphgrid'));
       graphrealization.set_description($(dslx), true);
@@ -810,14 +827,12 @@ function adaptor_init(url,theme,dslx) { //{{{
             error: report_failure
           });
         }
-        adaptor_update();
         manifestation.events.click(svgid);
         format_instance_pos();
         if (manifestation.selected() == "unknown") { // nothing selected
           $('#dat_details').empty();
         }
       };
-      adaptor_update();
 
       monitor_instance_pos();
       $('#dat_details').empty();
@@ -829,7 +844,6 @@ function adaptor_init(url,theme,dslx) { //{{{
     save['graph_adaptor'].update(function(graphrealization){
       var svgid = manifestation.selected();
       graphrealization.set_description($(dslx));
-      adaptor_update();
       manifestation.events.click(svgid);
       format_instance_pos();
     });
@@ -1183,6 +1197,7 @@ function save_svgfile() {// {{{
     }
   });
   gc.attr('width',start+1);
+  gc.find('.duration').remove();
   $.ajax({
     type: "GET",
     url: url + "/properties/attributes/info/",
@@ -1506,24 +1521,32 @@ function format_visual_set(what) {//{{{
 
     scroll_into_view(what);
 
-    if (actives > 0 && votes > 0)
+    if (actives > 0 && votes > 0) {
       $('g[element-id="' + what + '"] .super .colon').each(function(a,b){
         b.setAttribute('class','colon necessary');
       });
-    else
+    } else {
       $('g[element-id="' + what + '"] .super .colon').each(function(a,b){
         b.setAttribute('class','colon');
       });
-    if (actives > 0)
+    }
+    if (actives > 0) {
       $('g[element-id="' + what + '"] .super .active').each(function(a,b){
         b.setAttribute('class','active necessary');
         var txt = b.childNodes[0];
         txt.nodeValue = actives;
       });
-    else
+      $('g[element-id="' + what + '"] .super .exec').each(function(a,b){
+        b.setAttribute('class','exec necessary');
+      });
+    } else {
       $('g[element-id="' + what + '"] .super .active').each(function(a,b){
         b.setAttribute('class','active');
       });
+      $('g[element-id="' + what + '"] .super .exec').each(function(a,b){
+        b.setAttribute('class','exec');
+      });
+    }
     if (votes > 0)
       $('g[element-id="' + what + '"] .super .vote').each(function(a,b){
         b.setAttribute('class','vote necessary');