cpee-worklist 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88906c8c3bf4ed6fb2c559c215cad9042af3f22b1547adc27ff13a2bd75baf9f
-  data.tar.gz: 4786e6c93cd6fd5c738e0a7bfd0cde833e7b5ee23df8adba2decd55c68321473
+  metadata.gz: 9a77a7170f2fcd46b9770c423d9f71534c3326f7815beced68e65689fb38ca72
+  data.tar.gz: d6b1be26ea13097cca31f6feba56e289fe48742f7c51b9dc34bbea3e19b52bff
 SHA512:
-  metadata.gz: 6fcb076b22a4a4f520f9454c7b1ee0ecdc60eced3fcc4a22bcb54f9c6dc8983d739f82d2f5dde5dc78e9278acf57cf83c352a204674f01b82f5fcf2595b84a6b
-  data.tar.gz: 1a6b4022de420fe6b6d7869d0028136c5ec907054f1d16ae8f46ca3490af9a6c1a68c9fa2d2695e38b0e584abbd7e25348abffde9a6fb5f9e6b12863485a90a6
+  metadata.gz: 5d74ffbefc2a1258ffc95af5cdd47764390cf05eae5779598a19cc3aa4bc9062c3d0e02b808d0c868974550e35e3394898375e9e95c4180e84fb5bbd08270c82
+  data.tar.gz: 0d89ba884cd33219f7305bc13c4b13750648bca47c274c71d83987b155db33eb7e502f6844b89cc3d49caa4e1f9dfdfaa8f48b5604dbaecea339080a3d21f5b5

data/cpee-worklist.gemspec

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

data/lib/cpee-worklist/implementation.rb

@@ -234,6 +234,7 @@ module CPEE
                      activity['user'].include?(@r[-2])
                    ) && !restrict
                   tasks["#{activity['id']}"] = { :all => activity.has_key?('collect') && !activity['collect'].nil?, :uid => @r[-2], :priority => activity['priority'], :label => activity['process'] + ': ' + activity['label'] }
+                  tasks["#{activity['id']}"][:own] = activity['user'].include?(@r[-2])
                   tasks["#{activity['id']}"][:deadline] = activity['deadline'] if activity['deadline']
                 end
               end
@@ -277,7 +278,7 @@ module CPEE
           activity['user'] = []
           callback_id = @a[0].activities[index]['id']
           @a[0].activities.serialize
-          @a[0].notify('user/giveback', :callback_id => activity['id'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'],:instance_uuid => activity['uuid'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
+          @a[0].notify('user/giveback', :user => @r[-3], :callback_id => activity['id'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'],:instance_uuid => activity['uuid'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
           Riddl::Client.new(@a[0].activities[index]['url']).put [
             Riddl::Header.new('CPEE-UPDATE','true'),
             Riddl::Header.new('CPEE-STATUS','giveback'),

data/ui/css/ui.css

@@ -73,7 +73,6 @@ button.highlight { background-color: #cc0000; }
 
 #parameters .tabbelow { height: 9em; min-height: 1.7em; }
 
-#areatasks { height: 100%; overflow-x: hidden; overflow-y: scroll; }
 #dat_message {
   border:1em solid white;
 }

data/ui/direct.html

@@ -131,7 +131,7 @@
         <ui-behind                                          ></ui-behind>
       </ui-tabbar>
       <ui-content>
-        <ui-area data-belongs-to-tab="task" id="areatask"> <!--{{{-->
+        <ui-area data-belongs-to-tab="task" id="areatasklist"> <!--{{{-->
           <div id="dat_message" style="display: none;">Currently no tasks available.</div>
           <table id="dat_tasks" class="layout"></table>
         </ui-area> <!--}}}-->

data/ui/index.html

@@ -132,7 +132,7 @@
           <ui-behind                                          ></ui-behind>
       </ui-tabbar>
       <ui-content>
-        <ui-area data-belongs-to-tab="task" id="areatask"> <!--{{{-->
+        <ui-area data-belongs-to-tab="task" id="areatasklist"> <!--{{{-->
           <div id="dat_message" style="display: none;">Currently no tasks available.</div>
           <table id="dat_tasks" class="layout"></table>
         </ui-area> <!--}}}-->

data/ui/js/worklist.js

@@ -116,10 +116,10 @@ function get_worklist() {// {{{
         node.find('tr').attr('data-label',tasklabel);
         node.find('tr').addClass('priority_' + $(this).attr('priority'));
         $('.name',node).text(tasklabel);
-        if ($(this).attr('uid')=='*') {
-          $('.task_giveback',node).prop('disabled', true);
-        } else {
+        if ($(this).attr('own')=='true') {
           $('.task_take',node).prop('disabled', true);
+        } else {
+          $('.task_giveback',node).prop('disabled', true);
         }
         ctv.append(node);
       });
@@ -140,6 +140,7 @@ function take_work(url,butt,butt2,give_or_take){ //{{{
     success: function(){
       $(butt).prop('disabled','true');
       $(butt2).prop('disabled','false');
+      $(butt2).removeAttr('disabled');
     },
     error: function(a,b,c){
       alert("Put didn't work");
@@ -193,11 +194,24 @@ function do_work(taskid,taskidurl) { //{{{
               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);
+            }
+          }
+          {
+            let replaces = evaltext.match(/worklist-item/ms);
+            if (replaces && replaces.length > 0) {
+              evaltext = evaltext.replaceAll(replaces[0],'div.task.task_' + taskid);
+            }
+          }
 
           let container = $("<div class='task task_" + taskid + "'><form id='form_" + taskid + "'></form></div>");
           container.append(iform);
 
           let form = $("ui-area[data-belongs-to-tab="+taskid+"]");
+              form.addClass('areataskitem');
           let data;
           try { data = res.parameters; } catch (e) { data = {}; }
           form.append(container);
@@ -316,6 +330,14 @@ function subscribe_worklist(){ //{{{
                   break;
                 case 'status':
                   toggle_message(data.content.status);
+                  break;
+                case 'take':
+                case 'giveback':
+                  if (data.content.user != $("input[name=user-name]").val()) {
+                    tr.remove();
+                    get_worklist();
+                  }
+                  break;
                 default:
                   tr.remove();
                   get_worklist();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl