cpee-frames 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d33782c18a633f94faa8add964f95d0f44912516775c14538e6d12bdbc486505
-  data.tar.gz: fc7719677b5caa0f0a74b9536102c5d65ee2482e62201d1f64c0191a249b71f3
+  metadata.gz: bdca65cce57c3f745051b004fba4e46bc353dafa402fa04e4165a5fad8646010
+  data.tar.gz: 99881a242c05659c8e73fb3c2c8fb1b71275650f71482f41e327cd5fb620eee0
 SHA512:
-  metadata.gz: 4dda8dac7b5c65ff3d4a87681e843cfae72be0cbb5ae103727bdfa374a12dd6742fb1966ce4e70d457c16c4732e51abed31c7499a59c8adb778bcc92b556a410
-  data.tar.gz: 5d75b601db50a612e2b31d4200c7cefd4647c3eb0f864772b6585d94b5f71e7d122d320b0d0a7c709b31cc6bc77f4617aea17337108c47953a88ea6977e29375
+  metadata.gz: 2cfd3358722637897a9d2487fc3705038fca7b6b31b64a2038a26279c72f210a943da04387fba17badaf85251f5848f3c91680cff7266b9a663d748ee6cee818
+  data.tar.gz: f8197d917103bfc9c5eb23dfe88733eb39a47ef52e333707b308271bf2f5c3c9a483c7a52f07aa334e4c59ec4bb47daa9de2cd370eff8bf73afcb111e58a7c21

data/cpee-frames.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-frames"
-  s.version          = "1.0.2"
+  s.version          = "1.0.5"
   s.platform         = Gem::Platform::RUBY
   s.license          = "GPL-3.0"
   s.summary          = "Dashboard management service with UI and backend for the cpee.org family of workflow management tools"

data/lib/cpee-frames/implementation.rb

@@ -29,6 +29,17 @@ module CPEE
 
     SERVER = File.expand_path(File.join(__dir__,'frames.xml'))
 
+    def self::overlap?(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
+      if l1x > r2x || l2x > r1x
+          return false
+      end
+      if l1y > r2y || l2y > r1y
+          return false
+      end
+      return true
+    end
+
+
     # https://coderwall.com/p/atyfyq/ruby-string-to-boolean
     # showbutton
     refine String do #{{{
@@ -100,7 +111,7 @@ module CPEE
 
         #check if new frame overlaps others if it does, delete overlapped frames
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
             data_hash["data"].delete(c)
           end
         end
@@ -146,7 +157,7 @@ module CPEE
 
         #check if new frame overlaps others if it does, delete overlapped frames
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[1].value.to_i, @p[2].value.to_i, (@p[1].value.to_i + @p[3].value.to_i - 1), (@p[2].value.to_i + @p[4].value.to_i - 1))
             data_hash["data"].delete(c)
           end
         end
@@ -199,7 +210,7 @@ module CPEE
         data_hash = JSON::parse(file)
 
         data_hash["data"].each do | c |
-          if doOverlap(c['lx'], c['ly'], c['rx'], c['ry'], @p[0].value.to_i, @p[1].value.to_i, (@p[0].value.to_i + 1), (@p[1].value.to_i + 1))
+          if CPEE::Frames::overlap?(c['lx'], c['ly'], c['rx'], c['ry'], @p[0].value.to_i, @p[1].value.to_i, (@p[0].value.to_i + 1), (@p[1].value.to_i + 1))
             data_hash["data"].delete(c)
           end
         end
@@ -208,16 +219,6 @@ module CPEE
       end
     end
 
-    def doOverlap(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y)
-      if l1x > r2x || l2x > r1x
-          return false;
-      end
-      if l1y > r2y || l2y > r1y
-          return false;
-      end
-      return true;
-    end
-
     class Delete < Riddl::Implementation
       def response
         data_dir = @a[1]
@@ -249,7 +250,7 @@ module CPEE
       def response
         data_dir = @a[0]
         fname = File.join(data_dir,@r[-2],'frames.json')
-        if File.exists? fname
+        if File.exist? fname
 
           infofile = File.join(data_dir,@r[-2],'info.json')
           infojson = JSON::parse(File.read(infofile))
@@ -286,7 +287,7 @@ module CPEE
         #puts @p[0].value
 
         #fname = File.join(data_dir,@r[-2],'dataelements.json')
-        #if File.exists? fname
+        #if File.exist? fname
         #  Riddl::Parameter::Complex.new('value','application/json',File.read(fname))
         #else
         #  @status = 404
@@ -298,7 +299,7 @@ module CPEE
       def response
         data_dir = @a[0]
         fname = File.join(data_dir,@r[-2],'dataelements.json')
-        if File.exists? fname
+        if File.exist? fname
           Riddl::Parameter::Complex.new('value','application/json',File.read(fname))
         else
           @status = 404
@@ -310,7 +311,7 @@ module CPEE
       def response
         data_dir = @a[0]
         fname = File.join(data_dir,@r[-2],'info.json')
-        if File.exists? fname
+        if File.exist? fname
           Riddl::Parameter::Complex.new('value','application/json',File.read(fname))
         else
           @status = 404
@@ -322,7 +323,7 @@ module CPEE
       def response
         data_dir = @a[0]
         fname = File.join(data_dir,@r[-2],'info.json')
-        if File.exists? fname
+        if File.exist? fname
           infojson = JSON::parse(File.read(fname))
           Riddl::Parameter::Complex.new('value','application/json',infojson["langs"])
         else
@@ -335,7 +336,7 @@ module CPEE
       def response
         data_dir = @a[1]
         fname = File.join(data_dir,@r[-2],'info.json')
-        if File.exists? fname
+        if File.exist? fname
           infojson = JSON::parse(File.read(fname))
           infojson["lang"] = @p[0].value
 
@@ -361,7 +362,7 @@ module CPEE
       def response
         data_dir = @a[0]
         fname = File.join(data_dir,@r[-2],'style.url')
-        if File.exists? fname
+        if File.exist? fname
           Riddl::Parameter::Complex.new('url','text/plain',File.read(fname).strip)
         else
           @status = 404
@@ -373,7 +374,7 @@ module CPEE
       def response
         data_dir = @a[0]
         fname = File.join(data_dir,@r[-2],'cpeeinstance.url')
-        if File.exists? fname
+        if File.exist? fname
           Riddl::Parameter::Complex.new('url','text/plain',File.read(fname).strip)
         else
           @status = 404
@@ -387,7 +388,7 @@ module CPEE
       end
     end #}}}
 
-    class Handler < Riddl::Implementation
+    class Handler < Riddl::Implementation #{{{
       def response
         data_dir      = @a[1]
         topic         = @p[1].value
@@ -400,11 +401,6 @@ module CPEE
         parameters = content['parameters']
         receiving = content['received']
 
-        #puts instancenr
-        #puts activity
-        puts content['values']
-
-
         if content['values']&.any?
           #puts alldata['ausfuehrungen']
           puts "writing file"
@@ -415,7 +411,7 @@ module CPEE
         @a[0].send(@r[0])
         nil
       end
-    end
+    end #}}}
 
     class SSE < Riddl::SSEImplementation #{{{
       def onopen
@@ -499,7 +495,7 @@ module CPEE
             opts[:signals][idx] ||= Signaling.new
             opts[:signals2]["handler"] ||= Signaling.new
 
-            run Get, "test" if get
+            run Get if get
             run InitFrame, opts[:signals][idx], opts[:data_dir] if post 'input'
 
             run NewFrameSet, opts[:signals][idx], opts[:data_dir] if put 'sframe'

data/lib/cpee-frames/ui/framedata.html

@@ -42,19 +42,16 @@
     <link rel="stylesheet" href="../css/frames.css" type="text/css"/>
     <link class='custom' rel="stylesheet" href="" type="text/css"/>
 
-
-
     <!-- Forms
     <script src='https://centurio.work/out/forms/js/formio.full.min.js'></script>
     -->
     <script>
       if (location.href.match(/\/$/) == null) {
         location.href = location.href + '/';
-        }
+      }
     </script>
   </head>
   <body is="x-ui">
-    Data:
-    <div id="alldata"></div>
+    Data: <div id="alldata"></div>
   </body>
 </html>

data/lib/cpee-frames/ui/menu.html

@@ -53,15 +53,10 @@
           url: window.name,
           contentType: "application/json",
           data: JSON.stringify(menu),
-          success: function (data) {
-
-          }
+          success: function (data) { }
         });
-
-
         //alert(xyz);
       }
-
     </script>
   </head>
   <body is="x-ui">

data/lib/cpee-frames/ui/template.html

@@ -42,12 +42,10 @@
     <link rel="stylesheet" href="../css/frames.css" type="text/css"/>
     <link class='custom' rel="stylesheet" href="" type="text/css"/>
 
-    
     <link rel="icon" type="image/png" sizes="32x32" href="../css/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="96x96" href="../css/favicon-96x96.png">
     <link rel="icon" type="image/png" sizes="16x16" href="../css/favicon-16x16.png">
 
-
     <!-- Forms
     <script src='https://centurio.work/out/forms/js/formio.full.min.js'></script>
     -->

data/lib/cpee-frames/ui/test.html

@@ -47,9 +47,6 @@
     </script>
   </head>
   <body is="x-ui">
-    <div id="container">
-    test
-    </div>
-
+    <div id="container">test</div>
   </body>
 </html>

data/server/frames

@@ -16,7 +16,7 @@
 # CPEE-FRAMES (file LICENSE in the main directory). If not, see
 # <http://www.gnu.org/licenses/>.
 
-if File.exists?(File.join(__dir__,'..','lib','cpee-frames','implementation.rb'))
+if File.exist?(File.join(__dir__,'..','lib','cpee-frames','implementation.rb'))
   require_relative File.join(__dir__,'..','lib','cpee-frames','implementation')
 else
   require 'cpee-frames/implementation'

data/tools/cpee-frames

@@ -66,14 +66,14 @@ else
 end
 
 if command == 'new'
-  if !File.exists?(dir)
+  if !File.exist?(dir)
     FileUtils.cp_r(File.join(curpath,'..','server'),dir)
     FileUtils.mkdir(File.join(dir,'data')) rescue nil
   else
     puts 'Directory already exists.'
   end
 elsif command == 'newui'
-  if !File.exists?(dir)
+  if !File.exist?(dir)
     FileUtils.cp_r(File.join(curpath,'..','ui'),dir)
   else
     puts 'Directory already exists.'

data/ui/js/frame_data.js

@@ -1,13 +1,9 @@
-
-
 function showDocument(fr = "") {
-
   if(fr != ""){
     $.ajax({
       type: "GET",
-      url: 'https://centurio.work/out/frames/' + fr + '/dataelements.json',
+      url: '/out/frames/' + fr + '/dataelements.json',
       success: function(ret) {
-       
         $("#alldata").text(JSON.stringify(ret["ausfuehrungen"]));
       },
       error: function() {
@@ -18,11 +14,7 @@ function showDocument(fr = "") {
   }
 }
 
-
-function clearDocument() {
-  console.log('rrrr');
-}
-
+function clearDocument() { }
 
 function init() {
   es = new EventSource('handler/sse/');
@@ -47,7 +39,7 @@ function init() {
         catch (e) {
         }
       }
-        
+
     }
   };
   es.onerror = function() {
@@ -57,11 +49,6 @@ function init() {
   };
 }
 
-
-
-
-
-
 $(document).ready(function() {
   init();
 });

data/ui/js/test.js

@@ -1,5 +1,3 @@
-
-
 document.addEventListener('keyup', (event) => {
   if (event.key == 'ArrowRight') {
     $.ajax({
@@ -15,54 +13,49 @@ document.addEventListener('keyup', (event) => {
       }
     });
   }
-  
-    if (event.key == 'ArrowUp') {
 
-      $.ajax({
-        type: "POST",
-        url: "../Manuel",
-        headers: {"content-id": "frame"},
-        data: { lx: "2", ly: '0', rx: '1', ry: '2', url: 'https://centurio.work/' },
-        success: function(res) {
-          location.reload();
-        },
-        error: function (request, status, error) {
-          alert(request.responseText + status + error);
-        }
-      });
-    }
-    
-    
-    if (event.key == 'ArrowDown') {
-      $.ajax({
-        type: "POST",
-        url: "../Manuel",
-        headers: {"content-id": "frame"},
-        data: { lx: "0", ly: '0', rx: '2', ry: '2', url: 'https://centurio.work/flow-test/' },
-        success: function(res) {
-          location.reload();
-        },
-        error: function (request, status, error) {
-          alert(request.responseText + status + error);
-        }
-      });
-    }
-    
-    if (event.key == 'ArrowLeft') {
-      $.ajax({
-        type: "POST",
-        url: "../Manuel",
-        headers: {"content-id": "frame"},
-        data: { lx: "1", ly: '1', rx: '2', ry: '2', url: 'https://centurio.work/customers/evva/was/ui/' },
-        success: function(res) {
-          location.reload();
-        },
-        error: function (request, status, error) {
-          alert(request.responseText + status + error);
-        }
-      });
-    }
-  
-    
+  if (event.key == 'ArrowUp') {
+    $.ajax({
+      type: "POST",
+      url: "../Manuel",
+      headers: {"content-id": "frame"},
+      data: { lx: "2", ly: '0', rx: '1', ry: '2', url: 'https://centurio.work/' },
+      success: function(res) {
+        location.reload();
+      },
+      error: function (request, status, error) {
+        alert(request.responseText + status + error);
+      }
+    });
+  }
+
+  if (event.key == 'ArrowDown') {
+    $.ajax({
+      type: "POST",
+      url: "../Manuel",
+      headers: {"content-id": "frame"},
+      data: { lx: "0", ly: '0', rx: '2', ry: '2', url: 'https://centurio.work/flow-test/' },
+      success: function(res) {
+        location.reload();
+      },
+      error: function (request, status, error) {
+        alert(request.responseText + status + error);
+      }
+    });
+  }
+
+  if (event.key == 'ArrowLeft') {
+    $.ajax({
+      type: "POST",
+      url: "../Manuel",
+      headers: {"content-id": "frame"},
+      data: { lx: "1", ly: '1', rx: '2', ry: '2', url: 'https://centurio.work/customers/evva/was/ui/' },
+      success: function(res) {
+        location.reload();
+      },
+      error: function (request, status, error) {
+        alert(request.responseText + status + error);
+      }
+    });
+  }
 });
-   

data/ui/js/ui.js

@@ -1,21 +1,17 @@
 var reason ="";
 var storage = []; //{col:1, row:1, colamount:1, rowamount: 1}];
 
-
 function doOverlap(l1x, l1y, r1x, r1y, l2x, l2y, r2x, r2y) {
-    // If one rectangle is on left side of other
-    if (l1x > r2x || l2x > r1x)
-        return false;
-    // If one rectangle is above other
-    if (l1y > r2y || l2y > r1y)
-        return false;
-    return true;
+  // If one rectangle is on left side of other
+  if (l1x > r2x || l2x > r1x)
+      return false;
+  // If one rectangle is above other
+  if (l1y > r2y || l2y > r1y)
+      return false;
+  return true;
 }
 
-
 function makeFrame(lx, ly, rx, ry, content = "", id = "", defaultpara = "", showbutton = "", style = "") {
-
-
   //check if rects overlap if they do remove old ones
   for (i = 0; i < window.storage.length; i++) {
     if(doOverlap(window.storage[i].lx, window.storage[i].ly, window.storage[i].rx, window.storage[i].ry, lx, ly, rx, ry)){
@@ -38,7 +34,6 @@ function makeFrame(lx, ly, rx, ry, content = "", id = "", defaultpara = "", show
     spancol= ""
     if(rx-lx+1 > 1){
       spancol = " / span " + (rx-lx+1);
-
     }
 
     spanrow= ""
@@ -84,28 +79,23 @@ function makeFrame(lx, ly, rx, ry, content = "", id = "", defaultpara = "", show
         });
       }
 
-
       //hideRectangel(lx, ly, rx, ry)
     }
     else{
       $(".item" + lx + "-" + ly).html("No language available.<br> Nicht in der Sprache verfügbar.");
     }
   }
-
 }
 
 function sendForm(menuitem, cpeecallback,lx,ly){
   //Call iframe function that button has been pressed iframe should send json back
   //document.getElementById(decodeURIComponent(cpeecallback)).contentWindow.buttonPressed(cpeecallback);
 
-
   var formdata;
- if (typeof document.getElementById(decodeURIComponent(cpeecallback)).contentWindow.buttonPressed !== 'undefined' && $.isFunction(document.getElementById(decodeURIComponent(cpeecallback)).contentWindow.buttonPressed)) {
+  if (typeof document.getElementById(decodeURIComponent(cpeecallback)).contentWindow.buttonPressed !== 'undefined' && $.isFunction(document.getElementById(decodeURIComponent(cpeecallback)).contentWindow.buttonPressed)) {
     var formdata = document.getElementById(decodeURIComponent(cpeecallback)).contentWindow.buttonPressed();
   }
 
-
-
   $.ajax({
     type: "PUT",
     url: decodeURIComponent(cpeecallback),
@@ -115,9 +105,6 @@ function sendForm(menuitem, cpeecallback,lx,ly){
     }
   });
 
-
-
-
   //Its a design question if removing the frame should be done within centurio, do have more controll, or automatic within code?
   //close frame
 
@@ -131,11 +118,9 @@ function sendForm(menuitem, cpeecallback,lx,ly){
     success: function (data) {
     }
   });
-
 }
 
 function sendData(dataelement, datavalue){
-
   $.ajax({
     type: "Get",
     url: 'cpeeinstance.url',
@@ -150,11 +135,9 @@ function sendData(dataelement, datavalue){
       });
     }
   });
-
 }
 
 function sendCallback(callbackUrl, jsonToSend){
-
   $.ajax({
     type: "PUT",
     url: callbackUrl,
@@ -167,7 +150,6 @@ function sendCallback(callbackUrl, jsonToSend){
 }
 
 function showDocument() {
-
   $.ajax({
     type: "GET",
     url: 'style.url',
@@ -198,93 +180,9 @@ function showDocument() {
       clearDocument();
     }
   });
-
-
-
-
-  /*
-  $.ajax({
-    type: "GET",
-    url: 'languages',
-    success: function(ret) {
-      $('#content .added').remove();
-      $('#control .added').remove();
-      var ctemplate = $('#content template')[0];
-      var btemplate = $('#control template')[0];
-      var promises = [];
-      $('language',ret).each(function(i,e){
-        var cclone = document.importNode(ctemplate.content, true);
-        var bclone = document.importNode(btemplate.content, true);
-        promises.push(new Promise((resolve, reject) => {
-          $('> *',cclone).each(function(j,c){
-            $(c).addClass('added');
-            $(c).attr('lang', e.textContent);
-            $.ajax({
-              type: "GET",
-              url: 'documents/' + e.textContent,
-              success: function(doc) {
-                if (c.nodeName == 'IFRAME') {
-                  $(c).attr('src',doc);
-                } else {
-                  $('iframe',c).attr('src',doc);
-                }
-                $('#content').append(c);
-                resolve(true);
-              },
-              error: function() {
-                reject(false);
-                setTimeout(function(){ showDocument(); }, 500);
-              }
-            });
-          });
-        }));
-        promises.push(new Promise((resolve, reject) => {
-          $('> *',bclone).each(function(j,c){
-            $(c).addClass('added');
-            $(c).attr('lang', e.textContent);
-            $.ajax({
-              type: "GET",
-              url: 'buttons/' + e.textContent,
-              success: function(but) {
-                if (c.nodeName == 'BUTTON') {
-                  $(c).text(but);
-                } else {
-                  $('button',c).text(but);
-                }
-                $('#control').append(c);
-                resolve(true);
-              },
-              error: function() {
-                resolve(true);
-              }
-            });
-          });
-        }));
-      });
-      Promise.all(promises).then((values) => {
-        $.ajax({
-          type: "GET",
-          url: 'style.url',
-          success: function(ret) {
-            $('head link.custom').attr('href',ret);
-          }
-        });
-        lang_init('#content','#languages');
-        $('#languages').removeClass('hidden');
-        $('#nope').addClass('hidden');
-      });
-    },
-    error: function() {
-      reason = '';
-      clearDocument();
-    }
-  });
-  */
 }
 
-
 function clearDocument() {
-  console.log('rrrr');
   $('#languages').addClass('hidden');
   $('#nope').removeClass('hidden');
   $('#control .added').remove();
@@ -296,7 +194,6 @@ function reloadAllFrames() {
   location.reload();
 }
 
-
 function init() {
   es = new EventSource('sse/');
   es.onopen = function() {
@@ -330,12 +227,11 @@ function init() {
   es.onerror = function() {
     reason = 'Server down.';
     clearDocument();
+    es.close();
     setTimeout(init, 10000);
   };
 }
 
-
-
 function makeGrid(x, y) {
   const container = document.getElementById("container");
   container.style.setProperty('--grid-rows', y);
@@ -353,7 +249,6 @@ function makeGrid(x, y) {
   */
 };
 
-
 //https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Function/caller
 function sendJson(callback, jsonToSend){
   $.ajax({
@@ -367,7 +262,6 @@ function sendJson(callback, jsonToSend){
   });
 }
 
-
 $(document).ready(function() {
   init();
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-frames
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Manuell Gall
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Dashboard management service with UI and backend for the cpee.org family