cpee-worklist 1.0.11 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 803b1b014fedfd15a18792b7d8bd8ae44b8ca3f0f9c9e73ee3bce147c079fe66
-  data.tar.gz: 0a5faa9d0a7a044a450b17dcf2d30b98774800b5e3cf5d5c1e4e8dc535512d9f
+  metadata.gz: b72225ecc2d91fbb34ad5b7d9200629253f98fb5491d12530616a8df09274212
+  data.tar.gz: ef302a65ff231f1a1fb76ccdddb7b75fc7ec0d115423ff5f57b8c76eb3d16d6f
 SHA512:
-  metadata.gz: 5cd26a575083104789de654796f57ef5f403e7ee03fc4c0f79b16c0f0ee7225ef904c992eb71760e571c2d536e29bbcec46336baae02375c2e1ff4adf315212f
-  data.tar.gz: 60353fd3d43a1419b4633c26dd17aa5da78b350e907a684f3a64618df3055d177ae32cc0a63fc97a6fe8b20db67ac251a04df345e6248d5be82d4642907ca28c
+  metadata.gz: 8dee9ecaf43bced78032731890e5469b80e193af2fefb8a5a397101ad5d902a5fa7e972f165b4a08bdaa5f11c9c706b21fdb5003a0bac0a7096946cf50d0b0ea
+  data.tar.gz: ffe193949bb0c140d2e5eef84c2b3a09dee2385b73ca92898bbab7f54902c41a67ec19cf4a63aec6488c3f7bb8b9d3e57f9eb43509763aa340a202b43ff83dbd

data/cpee-worklist.gemspec

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

@@ -86,6 +86,14 @@ module CPEE
         activity['restrictions'] = []
         rests = JSON::parse(@p.shift.value) rescue nil
         activity['restrictions'] << rests unless rests.nil?
+        if @p.first.name == 'prioritization'
+          val = @p.shift.value
+          activity['prioritization'] = (JSON::parse(val) rescue val.gsub(/[\[\]()<>"']/,'').split(/\s*[,;]\s*/))
+        else
+          activity['prioritization'] = []
+        end
+        activity['label_extension'] = @p.first.name == 'label' ? @p.shift.value.to_s : nil
+        activity['label_extension_details'] = @p.first.name == 'label_details' ? @p.shift.value.to_s : nil
         activity['parameters'] = JSON::parse(@p.shift.value) rescue {}
         status, content, headers = Riddl::Client.new(activity['orgmodel']).get
         if status == 200
@@ -236,6 +244,9 @@ module CPEE
                   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']
+                  tasks["#{activity['id']}"][:prioritization] = activity['prioritization']&.join(', ') || ''
+                  tasks["#{activity['id']}"][:label_extension] = activity['label_extension'] if activity['label_extension']
+                  tasks["#{activity['id']}"][:label_extension_details] = activity['label_extension_details'] if activity['label_extension_details']
                 end
               end
             end
@@ -254,7 +265,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'].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)
@@ -311,7 +322,7 @@ module CPEE
       end
     end #}}}
 
-    class AssignTask < Riddl::Implementation #{{{
+   class AssignTask < Riddl::Implementation #{{{
       def response
        index = @a[0].activities.index{ |c| c["id"] == @r.last }
         if index

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

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

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

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

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

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

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

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

data/lib/cpee-worklist/wlengine.xml

@@ -38,6 +38,15 @@
       <parameter name="deadline" type="string"/>
     </optional>
     <parameter name="restrictions" type="string"/>
+    <optional>
+      <parameter name="prioritization" type="string"/>
+    </optional>
+    <optional>
+      <parameter name="label" type="string"/>
+    </optional>
+    <optional>
+      <parameter name="label_details" type="string"/>
+    </optional>
     <parameter name="data" type="string"/>
   </message> <!--}}}-->
 

data/ui/container.html

@@ -1,16 +1,16 @@
 <!--
-  This file is part of CPEE.
+  This file is part of CPEE-WORKLIST.
 
-  CPEE is free software: you can redistribute it and/or modify it under the terms
+  CPEE-WORKLIST 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
+  CPEE-WORKLIST 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
+  CPEE-WORKLIST (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 
@@ -34,7 +34,8 @@
     <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>
+
+    <link rel="stylesheet" href="css/container.css" type="text/css"/>
   </head>
-  <body>
-  </body>
+  <body is='x-ui-'></body>
 </html>

data/ui/css/container.css

@@ -0,0 +1,76 @@
+/*
+  This file is part of CPEE-WORKLIST.
+
+  CPEE-WORKLIST 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-WORKLIST 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-WORKLIST (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+:root {
+  --x-ui-border-color: #a1a1a1;
+  --x-ui-outside-color: #ffffff;
+  --x-ui-background-color: #ffffff;
+  --x-ui-light-text-color: #333;
+  --x-ui-light-back-color: #e8e8e8;
+  --x-ui-link-color: #425d73;
+  --x-ui-content-border-color: #ffed00;
+  --x-ui-content-light-background: #f0f0f0;
+  --x-ui-content-hover-background: #99cce660;
+}
+
+body {
+  -webkit-user-select: none;
+  -moz-user-select: -moz-none;
+  -ms-user-select: none;
+  user-select: none;
+  font-family: sans-serif;
+  font-size: 1em;
+  margin: 1em;
+}
+
+input { font-family: sans-serif; font-size: 1em; }
+
+textarea, input, select, button {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 1em;
+  resize: none;
+}
+
+button, select {
+  padding: .1em .2em;
+  border: 1pt solid var(--x-ui-border-color);
+  border-radius: 0.2em;
+  margin: 0;
+  font-size: 0.9em;
+  background: var(--x-ui-light-back-color);
+  background: -webkit-gradient(linear, left top, left bottom, from(white), to(var(--x-ui-light-back-color)));
+  background: -moz-linear-gradient(top, white, var(--x-ui-light-back-color));
+  cursor: pointer;
+}
+button::-moz-focus-inner {
+  border: 0 none;
+  padding: 0;
+  margin: 0;
+}
+button.highlight {
+  background: -webkit-gradient(linear, left top, left bottom, from(white), to(Highlight));
+  background: -moz-linear-gradient(top, white, Highlight);
+}
+
+input { font-family: sans-serif; font-size: 1em; }
+input::-webkit-input-placeholder { color: red; }
+input:-moz-placeholder { color: red; }
+
+a:link    { color:var(--x-ui-link-color); text-decoration:none; }
+a:visited { color:var(--x-ui-link-color); text-decoration:none; }
+a:hover   { color:var(--x-ui-light-text-color); text-decoration:underline; }
+a:active  { color:var(--x-ui-light-text-color); text-decoration:underline; }

data/ui/css/ui.css

@@ -1,3 +1,20 @@
+/*
+  This file is part of CPEE-WORKLIST.
+
+  CPEE-WORKLIST 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-WORKLIST 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-WORKLIST (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+*/
+
 body {
   -webkit-user-select: none;
   -moz-user-select: -moz-none;
@@ -93,6 +110,19 @@ button.highlight { background-color: #cc0000; }
 #dat_tasks tr:nth-child(odd)       { background-color: ButtonFace; color: ButtonText; }
 #dat_tasks tr:nth-child(odd) input { background-color: ButtonFace; }
 
+#areatasklist .dat_heading {
+  border: 1em solid white;
+  border-left: 0;
+  border-bottom: 0;
+  white-space: nowrap;
+}
+#areatasklist .dat_heading span {
+  font-weight: bold;
+  font-size: 1.2em;
+}
+
+.permahidden { display: none; }
+
 span.active {
   font-weight: bold;
   color: #cc0000;
@@ -146,19 +176,41 @@ ui-area > form {
   display: block;
 }
 
-#dat_tasks tr.priority_1:nth-child(even)       { background-color: #dc8add30; color: ButtonText; }
-#dat_tasks tr.priority_1:nth-child(even) input { background-color: #dc8add30; }
-#dat_tasks tr.priority_1:nth-child(odd)        { background-color: #dc8add80; color: ButtonText; }
-#dat_tasks tr.priority_1:nth-child(odd) input  { background-color: #dc8add80; }
+.dat_outer_table { margin-left: 1em; margin-top: 1em; margin-right: 1em; }
 
-#dat_tasks tr.priority_1 td:first-child::before {
-  content: !
-}
+.dat_table { margin-left: 1em; margin-top: 1em; margin-right: 1em; }
+.dat_table:last-child { margin-bottom: 1em; }
+.dat_table tr { white-space: nowrap; }
+
+thead td { margin: 0; padding: 0; }
+tbody.dat_table.dat_tasks_priority_high tr td:first-child { border-left: 0em solid transparent; }
+tbody.dat_table tr td:first-child { border-left: 1em solid transparent; }
+
+.dat_indent_table { margin-left: 1.5em; margin-top: 0; }
+
+.dat_table tr:nth-child(even)       { background-color: #dedddaff; color: ButtonText; }
+.dat_table tr:nth-child(even) input { background-color: #dedddaff; }
+.dat_table tr:nth-child(odd)        { background-color: #f6f5f4ff; color: ButtonText; }
+.dat_table tr:nth-child(odd) input  { background-color: #f6f5f4ff; }
 
-#dat_tasks tr.priority_42:nth-child(even)       { background-color: #99c1f130; color: ButtonText; }
-#dat_tasks tr.priority_42:nth-child(even) input { background-color: #99c1f130; }
-#dat_tasks tr.priority_42:nth-child(odd)        { background-color: #99c1f180; color: ButtonText; }
-#dat_tasks tr.priority_42:nth-child(odd) input  { background-color: #99c1f180; }
+.dat_table tr.priority_1:nth-child(even)       { background-color: #dc8add30; color: ButtonText; }
+.dat_table tr.priority_1:nth-child(even) input { background-color: #dc8add30; }
+.dat_table tr.priority_1:nth-child(odd)        { background-color: #dc8add80; color: ButtonText; }
+.dat_table tr.priority_1:nth-child(odd) input  { background-color: #dc8add80; }
+
+.dat_table tr.priority_42:nth-child(even)       { background-color: #99c1f130; color: ButtonText; }
+.dat_table tr.priority_42:nth-child(even) input { background-color: #99c1f130; }
+.dat_table tr.priority_42:nth-child(odd)        { background-color: #99c1f180; color: ButtonText; }
+.dat_table tr.priority_42:nth-child(odd) input  { background-color: #99c1f180; }
+
+.dat_table tr td.buttons {
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+.dat_table tr td.name {
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
 
 .pulseit{
 	animation: pulse linear 2s 3;
@@ -171,4 +223,37 @@ ui-area > form {
 	100%  { background-color: #ebdef0; }
 }
 
+ui-resizehandle {
+  border-left: 1px solid var(--x-ui-border-color);
+}
+#detailcolumn {
+  min-width: 2.5em;
+}
+#detailcolumn iframe {
+  width: 100%;
+  height: 100%;
+  border: 0 none;
+  border-left: 1em solid white;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  display: block;
+}
+
+body.drag-in-progress #detailcolumn iframe {
+  pointer-events: none;
+}
+
+.extension.clickable {
+  cursor: pointer;
+  color:var(--x-ui-link-color);
+  text-decoration:none;
+}
+.extension.clickable:hover {
+  color:var(--x-ui-light-text-color);
+  text-decoration:underline;
+}
 
+.filler {
+  width: 100%;
+}

data/ui/direct.html

@@ -1,16 +1,17 @@
+        <td class='filler'></td>
 <!--
-  This file is part of CPEE.
+  This file is part of CPEE-WORKLIST.
 
-  CPEE is free software: you can redistribute it and/or modify it under the terms
+  CPEE-WORKLIST 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
+  CPEE-WORKLIST 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
+  CPEE-WORKLIST (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 
@@ -33,6 +34,7 @@
     <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>
 
     <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
 
@@ -46,32 +48,29 @@
     <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
 
     <!-- Flos Stuff -->
-    <script type="text/javascript" src="js/worklist.js"></script>
+    <script type="text/javascript" src="js/structured.js"></script>
   </head>
-  <body data-defaultport="9398" is='x-ui-'>
+  <body data-defaultconfig='index.json' is='x-ui-'>
     <!-- The following are templates that get used during ui generation, change them carefully -->
-    <template id="dat_template_tasks_single">
-      <tr class="task"> <!--{{{-->
+    <template id="dat_template_tasks_single"><!--{{{-->
+      <tr class="task">
         <td class='name'></td>
-        <td class='sep'>⇒</td>
-        <td class='deadline'><em>No deadline.</em></td>
         <td class='buttons'>
-          <button class='task_take' value=''>Take</button>
-          <button class='task_giveback' value=''>Give Back</button>
+          <button class='task_continue' value=''>Continue ...</button>
           <button class='task_do' value=''>Do it!</button>
+          <button class='task_giveback' value=''>Others should do it!</button>
         </td>
+        <td class='filler'></td>
       </tr>
     </template>   <!--}}}-->
     <template id="dat_template_tasks_multi"> <!--{{{-->
       <tr class="task">
         <td class='name'></td>
-        <td class='sep'>⇒</td>
-        <td class='deadline'><em>No Deadline.</em></td>
         <td class='buttons'>
-          <button class='task_take' value='' style="visibility: hidden">Take</button>
-          <button class='task_giveback' value='' style="visibility: hidden">Give Back</button>
+          <button class='task_continue' value=''>Continue ...</button>
           <button class='task_do' value=''>Do it!</button>
         </td>
+        <td class='deadline filler'><em>(until <span></span></em>)</td>
       </tr>
     </template>   <!--}}}-->
     <template id="dat_template_orgmodels"> <!--{{{-->
@@ -132,8 +131,7 @@
       </ui-tabbar>
       <ui-content>
         <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>
+          <table class="dat_tasks_priority_high dat_tasks_own dat_tasks_priority dat_tasks_others dat_tasks_others_work dat_table"></table>
         </ui-area> <!--}}}-->
       </ui-content>
     </ui-rest>

data/ui/index.html

@@ -1,16 +1,16 @@
 <!--
-  This file is part of CPEE.
+  This file is part of CPEE-WORKLIST.
 
-  CPEE is free software: you can redistribute it and/or modify it under the terms
+  CPEE-WORKLIST 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
+  CPEE-WORKLIST 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
+  CPEE-WORKLIST (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 
@@ -47,32 +47,29 @@
     <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
 
     <!-- Flos Stuff -->
-    <script type="text/javascript" src="js/worklist.js"></script>
+    <script type="text/javascript" src="js/structured.js"></script>
   </head>
-  <body data-defaultport="9398" is='x-ui-'>
+  <body data-defaultconfig='index.json' is='x-ui-'>
     <!-- The following are templates that get used during ui generation, change them carefully -->
-    <template id="dat_template_tasks_single">
-      <tr class="task"> <!--{{{-->
+    <template id="dat_template_tasks_single"><!--{{{-->
+      <tr class="task">
         <td class='name'></td>
-        <td class='sep'>⇒</td>
-        <td class='deadline'><em>No deadline.</em></td>
         <td class='buttons'>
-          <button class='task_take' value=''>Take</button>
-          <button class='task_giveback' value=''>Give Back</button>
+          <button class='task_continue' value=''>Continue ...</button>
           <button class='task_do' value=''>Do it!</button>
+          <button class='task_giveback' value=''>Others should do it!</button>
         </td>
+        <td class='filler'></td>
       </tr>
     </template>   <!--}}}-->
     <template id="dat_template_tasks_multi"> <!--{{{-->
       <tr class="task">
         <td class='name'></td>
-        <td class='sep'>⇒</td>
-        <td class='deadline'><em>No Deadline.</em></td>
         <td class='buttons'>
-          <button class='task_take' value='' style="visibility: hidden">Take</button>
-          <button class='task_giveback' value='' style="visibility: hidden">Give Back</button>
+          <button class='task_continue' value=''>Continue ...</button>
           <button class='task_do' value=''>Do it!</button>
         </td>
+        <td class='deadline filler'><em>(until <span></span></em>)</td>
       </tr>
     </template>   <!--}}}-->
     <template id="dat_template_orgmodels"> <!--{{{-->
@@ -127,14 +124,13 @@
 
     <ui-rest class="hidden" id='main'>
       <ui-tabbar>
-          <ui-before                                          ></ui-before>
-          <ui-tab class="default" data-tab="task" id="tabtask">Tasks</ui-tab>
-          <ui-behind                                          ></ui-behind>
+        <ui-before                                          ></ui-before>
+        <ui-tab class="default" data-tab="task" id="tabtask">Tasks</ui-tab>
+        <ui-behind                                          ></ui-behind>
       </ui-tabbar>
       <ui-content>
         <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>
+          <table class="dat_tasks_priority_high dat_tasks_own dat_tasks_priority dat_tasks_others dat_tasks_others_work dat_table"></table>
         </ui-area> <!--}}}-->
       </ui-content>
     </ui-rest>

data/ui/index.json

@@ -0,0 +1,3 @@
+{
+  "names": 3
+}

data/ui/js/{worklist.js → structured.js}

@@ -1,3 +1,20 @@
+/*
+  This file is part of CPEE-WORKLIST.
+
+  CPEE-WORKLIST 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-WORKLIST 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-WORKLIST (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+*/
+
 function toggle_message(message=undefined) { //{{{
   var url =$("input[name=base-url]").val()+'/'+$("input[name=user-name]").val()+'/';
   if ($("#dat_tasks tr").length == 0) {
@@ -19,21 +36,49 @@ function toggle_message(message=undefined) { //{{{
   }
 } //}}}
 
+function config_defaults() { //{{{
+  var default_values = {};
+  if (location.protocol.match(/^file/)) {
+    default_values['base-url'] = 'http://localhost:9298/';
+  } else {
+    default_values['base-url']  = location.protocol + "//" + location.hostname + '/worklist/server';
+  }
+  default_values['names'] = 2;
+  return default_values;
+} //}}}
+
 $(document).ready(function() {// {{{
-  $("input[name=base-url]").val(location.protocol + "//" + location.host + '/worklist/server');
+  var q = $.parseQuerySimple();
+  $.ajax({
+    url: $('body').attr('data-defaultconfig'),
+    success: function(res){
+      var res_def = config_defaults();
+      if (res['base-url']) { res_def['base-url'] = res['base-url']; }
+      if (res['names']) { res_def['names'] = res['names']; }
+
+      $('body').attr('data-names', res_def['names']);
+      $('input[name=base-url]').val(res_def['base-url']);
+
+      if (q.user) {
+        $("input[name=user-name]").val(q.user);
+        uidash_toggle_vis_tab($("#worklist .switch"));
+        get_worklist();
+        subscribe_worklist();
+      }
+    },
+    error: function(){
+      var res = config_defaults();
+      $('body').attr('data-names', res_def['names']);
+      $('input[name=base-url]').val(res_def['base-url']);
+    }
+  });
+
   $("#arealogin > form").submit(function(event){
     get_worklist();
     subscribe_worklist();
     uidash_toggle_vis_tab($("#worklist .switch"));
     event.preventDefault();
   });
-  var q = $.parseQuerySimple();
-  if (q.user) {
-    $("input[name=user-name]").val(q.user);
-    uidash_toggle_vis_tab($("#worklist .switch"));
-    get_worklist();
-    subscribe_worklist();
-  }
   $(document).on('click','.orgmodeltab',function(event){
     var id = $(this).attr('data-tab');
     uidash_empty_tab_contents(id);
@@ -51,23 +96,66 @@ $(document).ready(function() {// {{{
     var url =$("input[name=user-url]").val()+'/tasks';
     var taskid = $(this).parents('tr').attr('data-id');
     var taskidurl = url + '/' + taskid;
-    take_work(taskidurl,$('.task_take',$(this).parent()),$('.task_giveback',$(this).parent()),1);
+    take_work(taskidurl,$(this).parents('tr'),1);
+    do_work(taskid,taskidurl);
+  });
+  $(document).on('click','.task_continue',function(){
+    var url =$("input[name=user-url]").val()+'/tasks';
+    var taskid = $(this).parents('tr').attr('data-id');
+    var taskidurl = url + '/' + taskid;
     do_work(taskid,taskidurl);
   });
   $(document).on('click','.task_take',function(){
     var url =$("input[name=user-url]").val()+'/tasks';
     var taskid = $(this).parents('tr').attr('data-id');
     var taskidurl = url + '/' + taskid;
-    take_work(taskidurl,$('.task_take',$(this).parent()),$('.task_giveback',$(this).parent()),1);
+    take_work(taskidurl,$(this).parents('tr'),1);
   });
   $(document).on('click','.task_giveback',function(){
     var url =$("input[name=user-url]").val()+'/tasks';
     var taskid = $(this).parents('tr').attr('data-id');
     var taskidurl = url + '/' + taskid;
-    take_work(taskidurl,$('.task_giveback',$(this).parent()),$('.task_take',$(this).parent()),0);
+    take_work(taskidurl,$(this).parents('tr'),0);
   });
 
 });// }}}
+function place_worklist_item(node,own) {
+  let prio = node.attr('data-priority');
+  let prioz = node.attr('data-prioritization');
+
+  if (own == 'true') {
+    $('.task_do',node).addClass('hidden');
+    $('.task_continue',node).removeClass('hidden');
+    $('.task_giveback',node).removeClass('hidden');
+  } else {
+    $('.task_do',node).removeClass('hidden');
+    $('.task_continue',node).addClass('hidden');
+    $('.task_giveback',node).addClass('hidden');
+  }
+
+  let ctv;
+  if (prio == 1) {
+    ctv = $(".dat_tasks_priority_high");
+  } else {
+    if (own == 'true') {
+      ctv = $(".dat_tasks_own");
+    } else {
+      if (prioz == '' || prioz.match($("input[name=user-name]").val())) {
+        ctv = $(".dat_tasks_priority");
+      } else {
+        ctv = $(".dat_tasks_others");
+      }
+    }
+  }
+  if (!ctv.is(node.parent())) {
+    ctv.append(node);
+  }
+  if (!$('.dat_tasks_priority_high').is(':empty')) { $('.dat_tasks_priority_high_head').removeClass('hidden'); } else { $('.dat_tasks_priority_high_head').addClass('hidden'); }
+  if (!$('.dat_tasks_priority').is(':empty'))      { $('.dat_tasks_priority_head').removeClass('hidden'); }      else { $('.dat_tasks_priority_head').addClass('hidden'); }
+  if (!$('.dat_tasks_own').is(':empty'))           { $('.dat_tasks_own_head').removeClass('hidden'); }           else { $('.dat_tasks_own_head').addClass('hidden'); }
+  if (!$('.dat_tasks_others').is(':empty'))        { $('.dat_tasks_others_head').removeClass('hidden'); }        else { $('.dat_tasks_others_head').addClass('hidden'); }
+  if (!$('.dat_tasks_others_work').is(':empty'))   { $('.dat_tasks_others_work_head').removeClass('hidden'); }   else { $('.dat_tasks_others_work_head').addClass('hidden'); }
+}
 
 function get_worklist() {// {{{
   $("input[name=user-url]").val($("input[name=base-url]").val()+'/'+$("input[name=user-name]").val());
@@ -76,6 +164,10 @@ function get_worklist() {// {{{
   // Set url (no more cookie nonsense!)
   history.replaceState({}, '', '?user='+encodeURIComponent($("input[name=user-name]").val()));
 
+  $('#detailcolumn').addClass('hidden');
+  $('#detailcolumnresizer').addClass('hidden');
+  $('#detailcolumn iframe').attr('src','');
+
   $.ajax({
     type: "GET",
     url: url,
@@ -101,27 +193,62 @@ function get_worklist() {// {{{
         }
       });
       $("#main").removeClass("hidden");
-      var ctv = $("#dat_tasks");
-      ctv.empty();
+
+      $('.dat_tasks_priority_high').empty();
+      $('.dat_tasks_priority').empty();
+      $('.dat_tasks_own').empty();
+      $('.dat_tasks_others').empty();
+      $('.dat_tasks_others_work').empty();
+
+      $('.dat_tasks_priority_high_head').addClass('hidden');
+      $('.dat_tasks_priority_head').addClass('hidden');
+      $('.dat_tasks_own_head').addClass('hidden');
+      $('.dat_tasks_others_head').addClass('hidden');
+      $('.dat_tasks_others_work_head').addClass('hidden');
+
       $(res).find('task').each(function(){
         if ($(this).attr('all') == "true") {
           var node = $($("#dat_template_tasks_multi")[0].content.cloneNode(true));
-          $('.deadline',node).text($(this).attr('deadline'));
+          $('.deadline span',node).text($(this).attr('deadline'));
         } else {
           var node = $($("#dat_template_tasks_single")[0].content.cloneNode(true));
         }
-        var taskidurl = $(this).attr('id');
-        var tasklabel = $(this).attr('label');
-        node.find('tr').attr('data-id',taskidurl);
-        node.find('tr').attr('data-label',tasklabel);
-        node.find('tr').addClass('priority_' + $(this).attr('priority'));
-        $('.name',node).text(tasklabel);
-        if ($(this).attr('own')=='true') {
-          $('.task_take',node).prop('disabled', true);
-        } else {
-          $('.task_giveback',node).prop('disabled', true);
+        let nam = $('.name',node)[0];
+        for (let i = 0; i < $('body').attr('data-names') - 1; i++) {
+          let n = nam.cloneNode(true);
+          $(nam).after(n);
         }
-        ctv.append(node);
+        node.find('tr').attr('data-id',$(this).attr('id'));
+        node.find('tr').attr('data-label',$(this).attr('label'));
+        node.find('tr').attr('data-priority',$(this).attr('priority'));
+        node.find('tr').attr('data-prioritization',$(this).attr('prioritization'));
+        node.find('tr').addClass('priority_' + $(this).attr('priority'));
+
+        let i = 1;
+        $(this).attr('label').split(':').forEach( e => {
+          $('.name:nth-child(' + i + ')',node).text(e);
+          i++;
+        });
+        let lex = $('.name:nth-child(' + i + ')',node);
+            lex.text($(this).attr('label_extension'));
+            lex.addClass('extension');
+            if ($(this).attr('label_extension_details')) {
+              lex.addClass('clickable');
+              lex.click((ele)=>{
+                let hl = $(this).attr('label_extension_details').match(/highlight=(a\d+,)+([a-z0-9]{6,8})$/);
+                if (hl && hl.length >= 3) {
+                  $('.highlight_active').removeAttr('style');
+                  $('.highlight_active').removeClass('highlight_active');
+                  $(ele.target).parent().css('background-color', '#' + hl.slice(-1)[0]);
+                  $(ele.target).parent().addClass('highlight_active');
+                }
+                $('#detailcolumn').removeClass('hidden');
+                $('#detailcolumnresizer').removeClass('hidden');
+                $('#detailcolumn iframe').attr('src','');
+                $('#detailcolumn iframe').attr('src',$(this).attr('label_extension_details'));
+              });
+            }
+        place_worklist_item(node.find('tr'),$(this).attr('own'));
       });
       toggle_message();
     },
@@ -131,16 +258,18 @@ function get_worklist() {// {{{
   });
 }// }}}
 
-function take_work(url,butt,butt2,give_or_take){ //{{{
+function take_work(url,node,give_or_take){ //{{{
   var op = give_or_take == 1 ? "take" : "giveback";
   $.ajax({
     type: "PUT",
     url: url,
     data:"operation="+op ,
     success: function(){
-      $(butt).prop('disabled','true');
-      $(butt2).prop('disabled','false');
-      $(butt2).removeAttr('disabled');
+      if (op == "take") {
+        place_worklist_item(node,'true');
+      } else if (op == "giveback") {
+        place_worklist_item(node,'false');
+      }
     },
     error: function(a,b,c){
       alert("Put didn't work");
@@ -203,7 +332,7 @@ function do_work(taskid,taskidurl) { //{{{
             }
           }
 
-          let worklist_form = $("<form id='worklist-form'></form></div>");
+          let worklist_form = $("<form id='worklist-form'></form>");
 
           let data;
           try { data = res.parameters; } catch (e) { data = {}; }
@@ -212,9 +341,13 @@ function do_work(taskid,taskidurl) { //{{{
               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
+
+                // investigate indirect eval and strict
+                iframe.contentWindow.eval(evaltext),
+
                 $("#worklist-form",iframe.contentWindow.form).on('submit',function(e){
 
                   let scount = 0;

data/ui/structured.html

@@ -0,0 +1,174 @@
+<!--
+  This file is part of CPEE-WORKLIST.
+
+  CPEE-WORKLIST 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-WORKLIST 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-WORKLIST (file LICENSE 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>Worklist</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>
+
+    <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
+
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
+
+    <!-- custom stuff, play arround  -->
+    <link rel="stylesheet" href="css/ui.css" type="text/css"/>
+    <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
+
+    <!-- Flos Stuff -->
+    <script type="text/javascript" src="js/structured.js"></script>
+  </head>
+  <body data-defaultconfig='structured.json' is='x-ui-'>
+    <!-- The following are templates that get used during ui generation, change them carefully -->
+    <template id="dat_template_tasks_single"><!--{{{-->
+      <tr class="task">
+        <td class='name'></td>
+        <td class='buttons'>
+          <button class='task_continue' value=''>Continue ...</button>
+          <button class='task_do' value=''>Do it!</button>
+          <button class='task_giveback' value=''>Others should do it!</button>
+        </td>
+        <td class='filler'></td>
+      </tr>
+    </template>   <!--}}}-->
+    <template id="dat_template_tasks_multi"> <!--{{{-->
+      <tr class="task">
+        <td class='name'></td>
+        <td class='buttons'>
+          <button class='task_continue' value=''>Continue ...</button>
+          <button class='task_do' value=''>Do it!</button>
+        </td>
+        <td class='deadline filler'><em>(until <span></span></em>)</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>   <!--}}}-->
+
+    <ui-tabbed id="worklist">
+      <ui-tabbar>
+        <ui-tab class="switch"                                                ></ui-tab>
+        <ui-tab class=""          data-tab="login"        id="tablogin"       >Login</ui-tab>
+        <ui-tab class="inactive hidden" data-tab="organisation" id="taborganisation">Organisation</ui-tab>
+        <ui-tab class="inactive " data-tab="configure"    id="tabconfigure"   >Configure</ui-tab>
+        <ui-behind><input name="current-instance" type="text" value="" readonly='readonly' style='display:none'/><a id='current-instance'></a></ui-behind>
+        <ui-last><a class="logo" href=".."></a></ui-last>
+      </ui-tabbar>
+      <ui-content>
+        <ui-area data-belongs-to-tab="login" id="arealogin"> <!--{ {{-->
+          <form>
+            <table class='layout'>
+            <tr>
+              <td>User Name:</td>
+              <td><input name="user-name" type="text" value=""/></td>
+            </tr>
+            <tr>
+              <td>Password:</td>
+              <td><input name="pass" disabled="disabled" type="text" value="Not necessary in this demo."/></td>
+              <td><input name="getListBt" type="submit" value="get Worklist"/></td>
+            </tr>
+            </table>
+          </form>
+        </ui-area> <!--}}}-->
+
+        <ui-area data-belongs-to-tab="organisation" id="areaorganisation" class="inactive"> <!--{{{-->
+          <ul id="orgmodels">
+          </ul>
+        </ui-area> <!--}}}-->
+
+        <ui-area data-belongs-to-tab="configure" id="areaconfigure" class="inactive"> <!--{{{-->
+          <table class='layout'>
+          <tr>
+            <td>Base URL:</td>
+            <td><input name="base-url" type="text" value=""/></td>
+          </tr>
+          <tr>
+            <td>User URL:</td>
+            <td><input name="user-url" type="text" value="" readonly='readonly'/></td>
+          </tr>
+          </table>
+        </ui-area> <!--}}}-->
+      </ui-content>
+    </ui-tabbed>
+
+    <ui-rest class="hidden" id='main'>
+      <ui-tabbar>
+          <ui-before                                          ></ui-before>
+          <ui-tab class="default" data-tab="task" id="tabtask">Tasks</ui-tab>
+          <ui-behind                                          ></ui-behind>
+      </ui-tabbar>
+      <ui-content>
+        <ui-area data-belongs-to-tab="task" id="areatasklist"> <!--{{{-->
+          <table class="dat_outer_table">
+            <thead>
+              <tr><td colspan="42">
+                <div   class="dat_tasks_priority_high_head dat_heading permahidden"></div>
+              </td></tr>
+            </thead>
+            <tbody class="dat_tasks_priority_high      dat_table dat_indent_table"></tbody>
+            <thead>
+              <tr><td colspan="42">
+                <div   class="dat_tasks_own_head           dat_heading hidden"><span>Tasks I currently work on ...</span></div>
+              </td></tr>
+            </thead>
+            <tbody class="dat_tasks_own                dat_table dat_indent_table"></tbody>
+            <thead>
+              <tr><td colspan="42">
+                <div   class="dat_tasks_priority_head      dat_heading hidden"><span>Tasks initiated by me ...</span></div>
+              </td></tr>
+            </thead>
+            <tbody class="dat_tasks_priority           dat_table dat_indent_table"></tbody>
+            <thead>
+              <tr><td colspan="42">
+                <div   class="dat_tasks_others_head        dat_heading hidden"><span>Tasks initiated by others ... (but I can do them as well)</span></div>
+              </td></tr>
+            </thead>
+            <tbody class="dat_tasks_others             dat_table dat_indent_table"></tbody>
+            <thead>
+              <tr><td colspan="42">
+                <div   class="dat_tasks_others_work_head   dat_heading hidden"><span>Tasks others currently work on ...</span></div>
+              </td></tr>
+            </thead>
+            <tbody class="dat_tasks_others_work        dat_table dat_indent_table"></tbody>
+          </table>
+        </ui-area> <!--}}}-->
+        <ui-resizehandle data-belongs-to-tab="task" id="detailcolumnresizer" data-label="drag to resize" class="hidden"></ui-resizehandle>
+        <ui-area data-belongs-to-tab="task" id="detailcolumn" class="hidden">
+           <iframe src=""></iframe>
+        </ui-area>
+      </ui-content>
+    </ui-rest>
+
+  </body>
+</html>

data/ui/structured.json

@@ -0,0 +1,3 @@
+{
+  "names": 4
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.13
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -98,9 +98,13 @@ 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
@@ -110,10 +114,14 @@ files:
 - server/worklist.conf
 - tools/cpee-worklist
 - ui/container.html
+- ui/css/container.css
 - ui/css/ui.css
 - ui/direct.html
 - ui/index.html
-- ui/js/worklist.js
+- ui/index.json
+- ui/js/structured.js
+- ui/structured.html
+- ui/structured.json
 homepage: http://cpee.org/
 licenses:
 - LGPL-3.0-or-later
@@ -133,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Worklist for the cloud process execution engine (cpee.org)