cpee-worklist 1.0.15 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c83f50ea5e814f2ecb82c5f009fd6e0b1491f2308a82b86871af7424ba04e525
-  data.tar.gz: 9c41f7084962862ef707e5091e3cc6efbd702ac577b94b74bed212e469ed661e
+  metadata.gz: 5bf102e677abb150275c9f4b01ce89eb120053ba7d3dd49e5b8f76f5a97fdee8
+  data.tar.gz: cec0662273259461355d533c9d3a5a15976369adf30fd6817f40b7d01e2141fa
 SHA512:
-  metadata.gz: 04322e1c05b4461721a58fcdaae48112db732261dce8d9114fe7020470cadd4abdce874e3605c949179dd30c76a209eefb8021f650dfa914d5009505567ec7a4
-  data.tar.gz: 9c18a5b290081a031c8894ce22f9e170e81bdd335ef860a2530d77cae4429e8cb6ffa40fa6dd67fa1f7817c71a8be7879f4b1a4aeab7f080caa5d11fa2eb61d3
+  metadata.gz: 471180152239ec324890cfd1a8175c1400f2ec132c509070ea698a4f1ef0d4ffcadc0c692c1d223dc32652d6d82ccfce0a0c77807ef499ea21a98cf4fd37e215
+  data.tar.gz: 5cfdf1e5abac3546f527526ee21d42c796b4db1576c78f6922baf7e69da4188d0e47316c037745ccee9dd1c4446cdbafdf6df997a74449354ed093b3a8770924

data/cpee-worklist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-worklist"
-  s.version          = "1.0.15"
+  s.version          = "1.0.17"
   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

@@ -81,6 +81,12 @@ module CPEE
         activity['unit'] = @p.first.name == 'unit' ? @p.shift.value : '*'
         activity['role'] = @p.first.name == 'role' ? @p.shift.value : '*'
         activity['priority'] = @p.first.name == 'priority' ? @p.shift.value.to_i : 1
+        activity['handling'] = @p.first.name == 'handling' ? @p.shift.value : 'single'
+
+        unless %w{single collect always}.include?(activity['handling'])
+          activity['handling'] == 'single'
+        end
+
         activity['collect'] = @p.first.name == 'collect' ? @p.shift.value.to_i : nil
         activity['deadline'] = @p.first.name == 'deadline' ? ((Time.now + ChronicDuration.parse(@p.shift.value)) rescue nil): nil
         activity['restrictions'] = []
@@ -152,18 +158,21 @@ module CPEE
     class TaskDel < Riddl::Implementation #{{{
       def response
         index = @a[0].activities.index{ |e| e["id"] == @r.last }
+        force = @a[1]
         if index
           activity = @a[0].activities[index]
-          if activity['collected'] && (activity['collected'] + 1) < activity['collect_max']
+          if !force && activity['collected'] && (activity['collected'] + 1) < activity['collect_max']
             activity['collected'] += 1
             activity['restrictions'] << { "restriction" => { "mode" => "prohibit", "id" => @r[-3] } }
             @a[0].activities.serialize
-            @a[0].notify('user/finish', :callback_id => activity['id'], :user => @r[-3], :role => activity['role'],:instance_uuid => activity['uuid'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
+            @a[0].notify('user/finish', :callback_id => activity['id'], :user => @r[-3], :role => activity['role'],  :instance_uuid => activity['uuid'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
+          elsif !force && activity['handling'] == 'always'
+            @a[0].notify('user/finish', :callback_id => activity['id'], :user => @r[-3], :role => activity['role'],  :instance_uuid => activity['uuid'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
           else
             activity = @a[0].activities.delete_at(index)
             @a[0].activities.serialize
             if @r.length == 3
-              @a[0].notify('task/delete', :callback_id => activity['id'],                                             :instance_uuid => activity['uuid'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
+              @a[0].notify('task/delete', :callback_id => activity['id'],                                            :instance_uuid => activity['uuid'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
               Riddl::Client.new(activity['url']).put
             else
               info = CPEE::Worklist::User::info(@a[0].opts,activity,@r[-3])
@@ -237,11 +246,13 @@ module CPEE
                      activity['unit'] == '*' ||
                      activity['unit'].casecmp(rel.attributes['unit']) == 0
                    ) && (
-                     activity['collect'] ||
+                     activity['handling'] == 'collect' ||
+                     activity['handling'] == 'always' ||
                      activity['user'].empty? ||
                      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'] }
+                   )
+                   !restrict
+                  tasks["#{activity['id']}"] = { :always => activity['handling'] == 'always', :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']
                   tasks["#{activity['id']}"][:prioritization] = activity['prioritization']&.join(', ') || ''
@@ -265,7 +276,7 @@ module CPEE
         index = @a[0].activities.index{ |c| c["id"] == @r.last }
         if index
           activity = @a[0].activities[index]
-          activity['user'].push @r[-3]if CPEE::Worklist::User::ok?(@a[0].opts,activity,@r[-3]) && !activity['user'].include?(@r[-3])
+          activity['user'].push @r[-3] if CPEE::Worklist::User::ok?(@a[0].opts,activity,@r[-3]) && !activity['user'].include?(@r[-3])
           info = CPEE::Worklist::User::info(@a[0].opts,activity,@r[-3])
           @a[0].activities.serialize
           @a[0].notify('user/take', :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'], :organisation => info)
@@ -307,7 +318,7 @@ module CPEE
       def response
         index = @a[0].activities.index{ |c| c["id"] == @r.last }
         if index
-          Riddl::Parameter::Complex.new "data","application/json", JSON.generate({:collect => @a[0].activities[index].has_key?('collect') && !@a[0].activities[index]['collect'].nil?, 'url' => @a[0].activities[index]['url'], 'form' => @a[0].activities[index]['form'], 'parameters' => @a[0].activities[index]['parameters'], 'label' => @a[0].activities[index]['label']})
+          Riddl::Parameter::Complex.new "data","application/json", JSON.generate({:always => @a[0].activities[index]['handling'] == 'always' ? true : false, :collect => @a[0].activities[index].has_key?('collect') && !@a[0].activities[index]['collect'].nil?, 'url' => @a[0].activities[index]['url'], 'form' => @a[0].activities[index]['form'], 'parameters' => @a[0].activities[index]['parameters'], 'label' => @a[0].activities[index]['label']})
         else
           @status = 404
         end
@@ -419,7 +430,7 @@ module CPEE
           on resource 'tasks' do
             on resource do
               run AssignTask,controller if put 'uid'
-              run TaskDel,controller if delete
+              run TaskDel,controller,true if delete
             end
           end
           on resource do

data/lib/cpee-worklist/wlengine.xml

@@ -28,9 +28,14 @@
         <parameter name="role" type="string"/>
       </group>
     </choice>
-    <optional>
-      <parameter name="priority" type="positiveInteger"/>
-    </optional>
+    <parameter name="priority" type="positiveInteger"/>
+    <parameter name="handling" type="string">
+      <choice>
+        <value>single</value>
+        <value>collect</value>
+        <value>always</value>
+      </choice>
+    </parameter>
     <optional>
       <parameter name="collect" type="nonNegativeInteger"/>
     </optional>
@@ -64,7 +69,7 @@
   </message>
 
   <message name="tasks">
-    <parameter name="tasks" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
+    <parameter name="tasks" mimetype="*/xml" handler="http://riddl.org/ns/handlers/relaxng">
       <element name="tasks" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0">
         <zeroOrMore>
           <element name="task">
@@ -92,6 +97,9 @@
             <attribute name="orgmodel">
               <data type="string"/>
             </attribute>
+            <element name="process">
+                  <data type="string"/>
+            </element>
             <element name="label">
                   <data type="string"/>
             </element>
@@ -101,7 +109,7 @@
             <element name="unit">
                   <data type="string"/>
             </element>
-            <oneOrMore>
+            <zeroOrMore>
               <element name="user">
                     <attribute name="uid">
                       <data type="string"/>

data/ui/direct.html

@@ -73,6 +73,15 @@
         <td class='deadline filler'><em>(until <span></span></em>)</td>
       </tr>
     </template>   <!--}}}-->
+    <template id="dat_template_tasks_always"> <!--{{{-->
+      <tr class="task">
+        <td class='name'></td>
+        <td class='buttons'>
+          <button class='task_do task_continue' value=''>Do it!</button>
+        </td>
+        <td class='filler'></td>
+      </tr>
+    </template>   <!--}}}-->
     <template id="dat_template_orgmodels"> <!--{{{-->
       <li class="orgmodel"><a class='link' href=""></a> ⇒ [<a class='model' href="">View Model</a>]</li>
     </template>   <!--}}}-->

data/ui/index.html

@@ -72,6 +72,15 @@
         <td class='deadline filler'><em>(until <span></span></em>)</td>
       </tr>
     </template>   <!--}}}-->
+    <template id="dat_template_tasks_always"> <!--{{{-->
+      <tr class="task">
+        <td class='name'></td>
+        <td class='buttons'>
+          <button class='task_do task_continue' value=''>Do it!</button>
+        </td>
+        <td class='filler'></td>
+      </tr>
+    </template>   <!--}}}-->
     <template id="dat_template_orgmodels"> <!--{{{-->
       <li class="orgmodel"><a class='link' href=""></a> ⇒ [<a class='model' href="">View Model</a>]</li>
     </template>   <!--}}}-->

data/ui/js/structured.js

@@ -210,6 +210,8 @@ function get_worklist() {// {{{
         if ($(this).attr('all') == "true") {
           var node = $($("#dat_template_tasks_multi")[0].content.cloneNode(true));
           $('.deadline span',node).text($(this).attr('deadline'));
+        } else if ($(this).attr('always') == "true") {
+          var node = $($("#dat_template_tasks_always")[0].content.cloneNode(true));
         } else {
           var node = $($("#dat_template_tasks_single")[0].content.cloneNode(true));
         }
@@ -248,7 +250,7 @@ function get_worklist() {// {{{
                 $('#detailcolumn iframe').attr('src',$(this).attr('label_extension_details'));
               });
             }
-        place_worklist_item(node.find('tr'),$(this).attr('own'));
+        place_worklist_item(node.find('tr'),$(this).attr('own') == 'true' || $(this).attr('always') == 'true' ? 'true' : 'false');
       });
       toggle_message();
     },
@@ -367,12 +369,12 @@ function do_work(taskid,taskidurl) { //{{{
                   var form_data = $(this).serializeArray();
                   var send_data = {};
                   var headers = {};
-                  if (res.collect) { headers['CPEE-UPDATE'] = 'true'; }
+                  if (res.collect || res.always) { 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'];
+                    send_data['data'][n['name']] = n['value'];
                   });
                   $.ajax({
                     type: "PUT",

data/ui/structured.html

@@ -72,6 +72,15 @@
         <td class='deadline filler'><em>(until <span></span></em>)</td>
       </tr>
     </template>   <!--}}}-->
+    <template id="dat_template_tasks_always"> <!--{{{-->
+      <tr class="task">
+        <td class='name'></td>
+        <td class='buttons'>
+          <button class='task_do task_continue' value=''>Do it!</button>
+        </td>
+        <td class='filler'></td>
+      </tr>
+    </template>   <!--}}}-->
     <template id="dat_template_orgmodels"> <!--{{{-->
       <li class="orgmodel"><a class='link' href=""></a> ⇒ [<a class='model' href="">View Model</a>]</li>
     </template>   <!--}}}-->

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Florian Stertz
 - Patrik Koenig
-autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -98,13 +97,9 @@ files:
 - lib/cpee-worklist/implementation.rb
 - lib/cpee-worklist/implementation.xml
 - lib/cpee-worklist/organisation.rng
-- lib/cpee-worklist/routing/end.pid
 - lib/cpee-worklist/routing/end.rb
-- lib/cpee-worklist/routing/forward-events.pid
 - lib/cpee-worklist/routing/forward-events.rb
-- lib/cpee-worklist/routing/forward-votes.pid
 - lib/cpee-worklist/routing/forward-votes.rb
-- lib/cpee-worklist/routing/persist.pid
 - lib/cpee-worklist/routing/persist.rb
 - lib/cpee-worklist/topics.xml
 - lib/cpee-worklist/user.rb
@@ -126,7 +121,6 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Worklist for the cloud process execution engine (cpee.org)
 test_files: []

data/lib/cpee-worklist/routing/end.pid

@@ -1 +0,0 @@
-551411

data/lib/cpee-worklist/routing/forward-events.pid

@@ -1 +0,0 @@
-551417

data/lib/cpee-worklist/routing/forward-votes.pid

@@ -1 +0,0 @@
-551423

data/lib/cpee-worklist/routing/persist.pid

@@ -1 +0,0 @@
-551429