RubyGems - cpee-worklist - Versions diffs - 1.0.10 → 1.0.11 - Mend

cpee-worklist 1.0.10 → 1.0.11

Files changed (6) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f5e998b250f45900c42856943ea0ed77674b3dc1aca8a639b9292edb56c5270
-  data.tar.gz: '060494d5269eab17272165105056c81e93b875fe0722bc3a9a91a8edf488b342'
+  metadata.gz: 803b1b014fedfd15a18792b7d8bd8ae44b8ca3f0f9c9e73ee3bce147c079fe66
+  data.tar.gz: 0a5faa9d0a7a044a450b17dcf2d30b98774800b5e3cf5d5c1e4e8dc535512d9f
 SHA512:
-  metadata.gz: 4774db8305dac31b524e7a9b4256bc40ca0c39d0b599e8989ee8502cd2de6f20a07d60929774643727e5492dd393155bc876760b10990cad0e4bc89e3c511e34
-  data.tar.gz: 118656ce46e5859ed72efd10648986afeb5ad5cfc359a74dc1317bc6db059505ad928439769c964404361870ad9abf1bd197122ad61317e5e619fc62eb77a561
+  metadata.gz: 5cd26a575083104789de654796f57ef5f403e7ee03fc4c0f79b16c0f0ee7225ef904c992eb71760e571c2d536e29bbcec46336baae02375c2e1ff4adf315212f
+  data.tar.gz: 60353fd3d43a1419b4633c26dd17aa5da78b350e907a684f3a64618df3055d177ae32cc0a63fc97a6fe8b20db67ac251a04df345e6248d5be82d4642907ca28c

data/cpee-worklist.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-worklist"
-  s.version          = "1.0.10"
+  s.version          = "1.0.11"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Worklist for the cloud process execution engine (cpee.org)"

data/ui/container.html ADDED Viewed

@@ -0,0 +1,40 @@
+<!--
+  This file is part of CPEE.
+  CPEE is free software: you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation,
+  either version 3 of the License, or (at your option) any later version.
+  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License along with
+  CPEE (file COPYING in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>Container</title>
+    <!-- libs, do not modify. When local than load local libs. -->
+    <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
+    <script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
+    <script type="text/javascript" src="/js_libs/util.js"></script>
+    <script type="text/javascript" src="/js_libs/printf.js"></script>
+    <script type="text/javascript" src="/js_libs/strftime.min.js"></script>
+    <script type="text/javascript" src="/js_libs/parsequery.js"></script>
+    <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+    <script type="text/javascript" src="/js_libs/marked.min.js"></script>
+  </head>
+  <body>
+  </body>
+</html>

data/ui/css/ui.css CHANGED Viewed

@@ -136,8 +136,14 @@ ui-area > form {
   padding-left: 1em;
 }
-div.task {
-  padding: 1em;
+.areataskitem iframe {
+  width: 100%;
+  border:0 none;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  display: block;
 }
 #dat_tasks tr.priority_1:nth-child(even)       { background-color: #dc8add30; color: ButtonText; }
@@ -164,3 +170,5 @@ div.task {
 	75%  { background-color: red; }
 	100%  { background-color: #ebdef0; }
 }

data/ui/js/worklist.js CHANGED Viewed

@@ -190,105 +190,101 @@ function do_work(taskid,taskidurl) { //{{{
               }
             }
           }
-          {
-            let replaces = iform.match(/form="worklist-form"/ms);
-            if (replaces && replaces.length > 0) {
-              iform = iform.replaceAll(replaces[0],'form="form_' + taskid + '"');
-            }
-          }
-          {
-            let replaces = iform.match(/div.task.current/ms);
-            if (replaces && replaces.length > 0) {
-              iform = iform.replaceAll(replaces[0],'div.task.task_' + taskid);
-            }
-          }
           {
             let replaces = iform.match(/worklist-item/ms);
             if (replaces && replaces.length > 0) {
-              iform = iform.replaceAll(replaces[0],'div.task.task_' + taskid);
+              iform = iform.replaceAll(replaces[0],'body');
             }
           }
           {
             let replaces = evaltext.match(/worklist-item/ms);
             if (replaces && replaces.length > 0) {
-              evaltext = evaltext.replaceAll(replaces[0],'div.task.task_' + taskid);
+              evaltext = evaltext.replaceAll(replaces[0],'body');
             }
           }
-          let container = $("<div class='task task_" + taskid + "'><form id='form_" + taskid + "'></form></div>");
-          container.append(iform);
+          let worklist_form = $("<form id='worklist-form'></form></div>");
-          let form = $("ui-area[data-belongs-to-tab="+taskid+"]");
-              form.addClass('areataskitem');
           let data;
           try { data = res.parameters; } catch (e) { data = {}; }
-          form.append(container);
-          eval(evaltext); // investigate indirect eval and strict
+          let iframe= $('<iframe src="container.html"></iframe>')[0];
+              iframe.onload = () => {
+                $(iframe.contentDocument.body).append(worklist_form);
+                $(iframe.contentDocument.body).append(iform);
+                iframe.contentWindow.data = data;
+                iframe.contentWindow.form = $(iframe.contentDocument.body);
+                iframe.contentWindow.eval(evaltext); // investigate indirect eval and strict
+                $("#worklist-form",iframe.contentWindow.form).on('submit',function(e){
-          uidash_activate_tab($('ui-tabbar ui-tab[data-tab=' + taskid + ']'));
-          $("#form_"+taskid).on('submit',function(e){
-            let scount = 0;
-            $('select[required][form="form_' + taskid + '"]').each((_,e) => {
-              if ($(e).val() == null) { scount += 1; }
-              if (scount == 1) {
-                $(e).focus();
-                $(e).removeClass('pulseit');
+                  let scount = 0;
+                  $('select[required][form="worklist-form"]',iframe.contentWindow.form).each((_,e) => {
+                    if ($(e).val() == null) { scount += 1; }
+                    if (scount == 1) {
+                      $(e).focus();
+                      $(e).removeClass('pulseit');
-                setTimeout(()=>{$(e).addClass('pulseit')},100);;
-              }
-            });
-            if (scount > 0) {
-              e.preventDefault();
-              return false;
-            }
-            var form_data = $(this).serializeArray();
-            var send_data = {};
-            var headers = {};
-            if (res.collect) { headers['CPEE-UPDATE'] = 'true'; }
-            send_data['user'] = $("input[name=user-name]").val();
-            send_data['raw'] = form_data;
-            send_data['data'] = {};
-            $.map(send_data['raw'], function(n, i){
-                send_data['data'][n['name']] = n['value'];
-            });
-            $.ajax({
-              type: "PUT",
-              url: res.url,
-              headers: headers,
-              contentType: "application/json",
-              data: JSON.stringify(send_data),
-              success: function(something){
-                $.ajax({
-                  type: "DELETE",
-                  url: taskidurl,
-                  success: function(del){
-                    uidash_close_tab('ui-tab[data-tab='+taskid+'] ui-close');
-                    get_worklist();
-                  },
-                  error: function(a,b,c){
-                    console.log("Delete failed");
-                  }
-                });
-              },
-              error: function(a,b,c){
-                $.ajax({
-                  type: "DELETE",
-                  url: taskidurl,
-                  success: function(del){
-                    uidash_close_tab('ui-tab[data-tab='+taskid+'] ui-close');
-                    get_worklist();
-                  },
-                  error: function(a,b,c){
-                    console.log("Delete failed");
+                      setTimeout(()=>{$(e).addClass('pulseit')},100);;
+                    }
+                  });
+                  if (scount > 0) {
+                    e.preventDefault();
+                    return false;
                   }
+                  var form_data = $(this).serializeArray();
+                  var send_data = {};
+                  var headers = {};
+                  if (res.collect) { headers['CPEE-UPDATE'] = 'true'; }
+                  send_data['user'] = $("input[name=user-name]").val();
+                  send_data['raw'] = form_data;
+                  send_data['data'] = {};
+                  $.map(send_data['raw'], function(n, i){
+                      send_data['data'][n['name']] = n['value'];
+                  });
+                  $.ajax({
+                    type: "PUT",
+                    url: res.url,
+                    headers: headers,
+                    contentType: "application/json",
+                    data: JSON.stringify(send_data),
+                    success: function(something){
+                      $.ajax({
+                        type: "DELETE",
+                        url: taskidurl,
+                        success: function(del){
+                          uidash_close_tab('ui-tab[data-tab='+taskid+'] ui-close');
+                          get_worklist();
+                        },
+                        error: function(a,b,c){
+                          console.log("Delete failed");
+                        }
+                      });
+                    },
+                    error: function(a,b,c){
+                      $.ajax({
+                        type: "DELETE",
+                        url: taskidurl,
+                        success: function(del){
+                          uidash_close_tab('ui-tab[data-tab='+taskid+'] ui-close');
+                          get_worklist();
+                        },
+                        error: function(a,b,c){
+                          console.log("Delete failed");
+                        }
+                      });
+                      // TODO
+                      console.log("Put didnt work");
+                    }
+                  });
+                  e.preventDefault();
                 });
-                // TODO
-                console.log("Put didnt work");
               }
-            });
-            e.preventDefault();
-          });
+          let taskitem = $("ui-area[data-belongs-to-tab="+taskid+"]");
+              taskitem.addClass('areataskitem');
+          taskitem.append(iframe);
+          uidash_activate_tab($('ui-tabbar ui-tab[data-tab=' + taskid + ']'));
         },
         error: function(a,b,c){
           $.ajax({

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-07-14 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -109,6 +109,7 @@ files:
 - server/worklist
 - server/worklist.conf
 - tools/cpee-worklist
+- ui/container.html
 - ui/css/ui.css
 - ui/direct.html
 - ui/index.html