cpee 2.1.91 → 2.1.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7826a9cc5914c6a2d2c33e1fbfc64bef917aef446ca899599edaf13dc9c52fdd
-  data.tar.gz: 9c25629356d3c85efe04ce7fd6b1317bfc053465ecd3384fd0d3a2bfc0df6190
+  metadata.gz: 6068f986f407667e9973cecebe9e44f299a4af0d30173394af1767dbb02f9515
+  data.tar.gz: e7450a6cf90f7e4e8552938f75da829f7e9e85bc87b5d9bb5f653432f7b59a31
 SHA512:
-  metadata.gz: 86cc1b6157b1e05dcd6bde0417f15e027e565e032cc4aa9714de25506a3dd3b1dd5802580552ab047c1e776b9f0a8f0286a9935f3a84edea6428720443519db3
-  data.tar.gz: 6b23dd951e896591748d05ff281fa673710d0eb5828c5e93d1fb64e03276092b26bbb49b86840576c91dc658e2bb63352fe8e585d7557b2e315e74c026bbdddb
+  metadata.gz: 3c06d2c59aeea2a90bf3f88ec0aca9d2a1ebae640009d80faf9ad8eeb5e5664109c8a8a49f527c44e222f195e4d357f62917660d2e36671388eb2c79b92412fb
+  data.tar.gz: 9401865c365904c987d743d2e9eaa35953800152d400ce86c78838a76ec6efa73dde341f6ed4ae4cd496b6c7ae3623f706964b097a0200ac38def0e85a0e0241

data/Rakefile

@@ -25,6 +25,13 @@ task :install => :gem do |r|
   `gem install pkg/cpee.gem`
 end
 
+# task :release => :gem do |r|
+#   GIT_COMMITTER_DATE="$(git show develop --format=%aD | head -1)" \
+#   git tag -a "v1.7.0" develop -m "tag v1.7.0" \
+#   && git push --tags origin develop \
+#   && git --no-pager tag --list --format='%(refname)   %(taggerdate)'
+# end
+
 desc "Clean instances"
 task :clean do
   Dir.glob("server/instances/*").collect{ |i| i if i =~ /\/\d+$/ }.compact.each do |i|

data/cockpit/css/llm.css

@@ -38,7 +38,7 @@
   overflow-y: scroll;
 }
 #prompt:empty:before {
-  font-family: sans-serif;
+  font-family: adawaita-sans;
   white-space: normal;
   content: attr(placeholder);
   display: block;

data/cockpit/css/resources-label.css

@@ -32,5 +32,5 @@ svg.displaylabel text.label {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
 }

data/cockpit/css/ui.css

@@ -3,7 +3,7 @@ body {
   -moz-user-select: -moz-none;
   -ms-user-select: none;
   user-select: none;
-  font-family: sans-serif;
+  font-family: adawaita-sans;
   font-size: 1em;
 }
 
@@ -31,7 +31,7 @@ body {
   background-color: #e9e9e9;
 }
 
-#instance ui-content { height: 7em; }
+#instance ui-content { height: 6em; }
 
 #areanew td:nth-child(2)       { padding-top: 0.4em; padding-bottom: 0.4em; }
 #areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }

data/cockpit/css/wfadaptor.css

@@ -26,6 +26,7 @@
   --wfadaptor-label: #d4d4d4;
   --wfadaptor-mark: #d4d4d4;
   --wfadaptor-selected: #f57900;
+  --wfadaptor-hover: #f57900;
   --wfadaptor-stripe: #e9e9e9;
   --wfadaptor-background: #ffffff;
   --wfadaptor-menu: #ef2929;
@@ -42,12 +43,6 @@ svg rect.group {
   fill: var(--wfadaptor-highlight);
   fill-opacity: 0.2;
 }
-
-svg g.passive .rfill {
-  fill: var(--wfadaptor-exec-passive);
-  fill-opacity:1;
-}
-
 svg rect.stripe.even {
   fill: var(--wfadaptor-background);
 }
@@ -55,34 +50,50 @@ svg rect.stripe.odd {
   fill: var(--wfadaptor-stripe);
 }
 
-svg g.active .rfill {
-  fill: var(--wfadaptor-exec-active);
-  fill-opacity:1;
+svg g.passive .execstyle {
+  stroke: var(--wfadaptor-exec-passive);
+  stroke-width: 4;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
-svg g.vote .rfill {
-  fill: var(--wfadaptor-exec-vote);
-  fill-opacity:1;
+svg g.active .execstyle {
+  stroke: var(--wfadaptor-exec-active);
+  stroke-width: 4;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
-svg g.passive .rline {
+svg g.vote .execstyle {
+  stroke: var(--wfadaptor-exec-vote);
+  stroke-width: 4;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+}
+
+svg g.passive .execstylethin {
   stroke: var(--wfadaptor-exec-passive);
+  stroke-width: 2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
-svg g.active .rline {
+svg g.active .execstylethin {
   stroke: var(--wfadaptor-exec-active);
+  stroke-width: 2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
-svg g.vote .rline {
+svg g.vote .execstylethin {
   stroke: var(--wfadaptor-exec-vote);
+  stroke-width: 2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
 
-svg .rfill.menu {
-  fill: var(--wfadaptor-menu);
-  fill-opacity:1;
-}
-svg .hfill.menu {
-  fill: var(--wfadaptor-menu);
-  fill-opacity:1;
+svg .menu {
+  fill: var(--wfadaptor-menu) !important;
+  fill-opacity:1 !important;
 }
 
-svg line.ourline, svg path.ourline {
+svg line.edge, svg path.edge {
   stroke-opacity:1;
   stroke: var(--wfadaptor-base);
   stroke-width: 2;
@@ -126,7 +137,7 @@ svg .standthin {
   fill: var(--wfadaptor-background);
   fill-opacity:1;
   stroke: var(--wfadaptor-base);
-  stroke-width:1.0;
+  stroke-width: 1.0 !important;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -207,18 +218,8 @@ svg .marked text.label {
   color: var(--wfadaptor-label);
   fill: var(--wfadaptor-label);
 }
-svg .marked .cfill {
-  fill: var(--wfadaptor-mark);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-mark);
-  stroke-width:0.2;
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-}
-svg .marked .cline {
+
+svg .marked .markstyle {
   stroke: var(--wfadaptor-mark);
   stroke-linecap:round;
   stroke-linejoin:round;
@@ -236,22 +237,7 @@ svg.labelsrow text.label:hover, svg.labelsrow text.label.hover {
 svg text.label.selected {
   fill: var(--wfadaptor-selected);
 }
-svg .selected text.label {
-  color: var(--wfadaptor-selected);
-  fill: var(--wfadaptor-selected);
-}
-svg .selected .cfill {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-selected);
-  stroke-width:0.2;
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-}
-svg .selected .cline {
+svg .selected .markstyle {
   stroke: var(--wfadaptor-selected);
   stroke-linecap:round;
   stroke-linejoin:round;
@@ -305,7 +291,7 @@ svg text.normal {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
 }
 svg text.inverted {
   font-size:20px;
@@ -321,7 +307,7 @@ svg text.inverted {
   fill: var(--wfadaptor-background);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
 }
 
 svg text.super {
@@ -338,15 +324,40 @@ svg text.super {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
+}
+svg tspan.exec {
+  fill: var(--wfadaptor-exec-active-text);
+  display: none;
+
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
 }
 svg tspan.active {
   fill: var(--wfadaptor-exec-active-text);
   display: none;
+
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
 }
 svg tspan.vote {
   fill: var(--wfadaptor-exec-vote-text);
   display: none;
+
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
 }
 svg tspan.colon {
   display: none;
@@ -369,7 +380,7 @@ svg text.normallarge {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
 }
 
 svg text.small {
@@ -386,7 +397,7 @@ svg text.small {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
 }
 
 svg text.label {
@@ -401,8 +412,21 @@ svg text.label {
   color: var(--wfadaptor-base);
   fill: var(--wfadaptor-base);
   fill-opacity:1;
-  stroke:none;
-  font-family:Arial;
+}
+svg text.label tspan {
+  font-size:12px;
+}
+
+svg text.label.standalone {
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
+}
+svg text.label.rotate {
+  transform: translateY(10px) rotate(-30deg);
 }
 
 svg text.smaller {
@@ -419,7 +443,7 @@ svg text.smaller {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
 }
 
 #arrow {
@@ -428,54 +452,19 @@ svg text.smaller {
   fill: var(--wfadaptor-base);
 }
 
-svg g.element[element-id].hover .hfill {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
+svg g.element[element-id].hover {
   cursor: pointer;
 }
-svg g.element[element-id].hover .hline {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-selected);
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-  cursor: pointer;
+
+svg g.element[element-id].hover .hoverstyle {
+  stroke: var(--wfadaptor-hover);
+  stroke-width: 3;
 }
-svg g.element[element-id].hover .htext {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-selected);
-  stroke-width:0.2;
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-  cursor: pointer;
+svg g.element[element-id].hover .hoverstylethin {
+  stroke: var(--wfadaptor-hover);
+  stroke-width: 2;
 }
 svg g.element[element-id].hover > text.label {
   color: var(--wfadaptor-selected);
   fill: var(--wfadaptor-selected);
 }
-svg g.element[element-id].hover .cfill {
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-base);
-  stroke-width:0.2;
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-}
-svg g.element[element-id].hover .cline {
-  stroke: var(--wfadaptor-base);
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-}

data/cockpit/edit.html

@@ -176,8 +176,8 @@
             </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>
+              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save<br>testset</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg<br>graph</button>
             </div><div class='section' id='modifiers'>
               <template id="item">
                 <div>

data/cockpit/index.html

@@ -19,6 +19,7 @@
   <head>
     <meta charset="utf-8"/>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <link rel="icon" type="image/png" href="/favicon.png">
     <title>CPEE Cockpit</title>
 
     <!-- libs, do not modify. When local than load local libs. -->
@@ -177,8 +178,8 @@
             </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>
+              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save<br>testset</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg<br>graph</button>
             </div><div class='section' id='modifiers'>
               <template id="item">
                 <div>

data/cockpit/js/details.js

@@ -13,6 +13,10 @@ $(document).ready(function() {
       e.preventDefault()
     }
   });
+  $(document).on('change','#dat_details input',function(e){
+    clearTimeout(timer);
+    setTimeout(do_main_save, 1);
+  });
   $(document).on('relaxngui_remove', '#dat_details', function(e){
     clearTimeout(timer);
     do_main_save();
@@ -106,7 +110,6 @@ function do_main_work(svgid) { //{{{
         },
         data: desc.get_description()
       });
-      adaptor_update();
       format_instance_pos();
 
       document.dispatchEvent(graph_changed);

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,15 @@ 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.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 +705,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;
                 }
 
@@ -810,14 +820,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 +837,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();
     });
@@ -937,6 +944,7 @@ function monitor_instance_pos_change(content) {// {{{
   if (content['at']) {
     $.each(content['at'],function(a,b){
       format_visual_add(b.position,"passive",false);
+      console.log('rrrrrr add', b.position);
     });
   }
   if (content['after']) {
@@ -947,6 +955,7 @@ function monitor_instance_pos_change(content) {// {{{
   if (content['unmark']) {
     $.each(content['unmark'],function(a,b){
       format_visual_remove(b.position,"passive",false)
+      console.log('rrrrrr remove', b.position);
     });
   }
   if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
@@ -1506,24 +1515,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');