petri_flow 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8edfa5f265e495edad2726cb2d812e0dea76978623cc7f9e0c03d2aaa27c7e90
-  data.tar.gz: 8d4b8737d9fb6d4b36977d873a078d57cbba1bbffebe0d357a12e62904de4025
+  metadata.gz: 4f413b92f6d4f452aa139f22ca407fce87cb4b8ca39b8afc3c2b09df509c8def
+  data.tar.gz: 14a8a81e41d3581a5225c7a21d8ec0a56146886b986ada2d902521256c1da6ad
 SHA512:
-  metadata.gz: 36a38a82bc4b3b45b0879c5019e52417589a5868192828854091b9ead9e8f34384c7063325e0d1405e6bcfe18c318f11451630226354e0f966a2277ed5ba4e2f
-  data.tar.gz: 8b7d014f64cfd03d7d794d87f2556c115a4b095e23dbdb4b5e67f73f7e62b4f44924769c73ad66dec1b9362264f64df7e09fe7f92df549a044f8e62c9aa91498
+  metadata.gz: 360f40f0da4d06be85a0a2f463c89ed0759e0137d356609fc28f80ae674118d11882d64f063755c33dd903a32868b7343c300ec941ca6eb86cb1aa3bda53375a
+  data.tar.gz: 10ed23928c6cec4cf125bc02b39aef86efa6c9131632148cc2be7f366e05a66a1974825b77c9a8939fd995e30a609b51ce66f4f5a4212c7b77409aad550f85ae

data/app/controllers/wf/transitions_controller.rb

@@ -72,7 +72,8 @@ module Wf
           :deadline_callback,
           :sub_workflow_id,
           :multiple_instance,
-          :finish_condition
+          :finish_condition,
+          :dynamic_assign_by_id
         )
       end
   end

data/app/controllers/wf/workitems_controller.rb

@@ -37,6 +37,11 @@ module Wf
     end
 
     def finish
+      if dynamic_assignments = params.dig(:workitem, :dynamic_assignments)
+        dynamic_assignments.permit!.each do |t_id, party_id|
+          Wf::CaseCommand::AddManualAssignment.call(@workitem.case, @workitem.workflow.transitions.find(t_id), Wf::Party.find(party_id))
+        end
+      end
       if @workitem.transition.form && params[:workitem][:entry]
         form = @workitem.transition.form
         cmd = Wf::CaseCommand::CreateEntry.call(form, @workitem, wf_current_user, params[:workitem][:entry].permit!)

data/app/models/wf/transition.rb

@@ -25,6 +25,7 @@
 #  sub_workflow_id       :integer
 #  multiple_instance     :boolean          default("false")
 #  finish_condition      :string           default("Wf::MultipleInstances::AllFinish")
+#  dynamic_assign_by_id  :integer
 #
 
 module Wf
@@ -36,6 +37,8 @@ module Wf
     has_many :workitems
     belongs_to :form, optional: true, polymorphic: true
     belongs_to :sub_workflow, optional: true, class_name: "Wf::Workflow"
+    belongs_to :dynamic_assign_by, optional: true, class_name: "Wf::Transition"
+    has_many :dynamic_assignments, class_name: "Wf::Transition", foreign_key: "dynamic_assign_by_id"
 
     enum trigger_type: {
       user: 0,

data/app/views/wf/transitions/_form.html.erb

@@ -34,11 +34,6 @@
         <%= f.text_field :trigger_limit, class: "form-control", placeholder: "Trigger Limit" %>
       </div>
 
-      <div class="form-group">
-        <%= f.label :sort_order, class: "label" %>
-        <%= f.text_field :sort_order, class: "form-control", placeholder: "Sort Order" %>
-      </div>
-
       <div class="form-group">
         <%= f.label :trigger_type, class: "label" %>
         <%= f.select :trigger_type, Wf::Transition.trigger_types.keys, {}, class: "form-control custom-select", placeholder: "Trigger Type" %>
@@ -55,6 +50,7 @@
       <%= f.select :sub_workflow_id, options_for_select(Wf::Workflow.valid.all.map{|x| [x.name, x.id]} || []), {include_blank: 'Start a sub workflow?'}, class: "form-control custom-select", placeholder: "Sub Workflow" %>
     </div>
   </div>
+  </div>
 
   <div class="card">
   <h5 class="card-header">Dynimac Form</h5>
@@ -66,6 +62,16 @@
     </div>
   </div>
 
+  <div class="card">
+  <h5 class="card-header">Dynamic Assign By</h5>
+  <div class="card-body">
+    <div class="form-group">
+      <%= f.label :dynamic_assign_by, class: "label" %>
+      <%= f.select :dynamic_assign_by_id, options_for_select(@workflow.transitions.where("id != ?", @transition.id).all.map{|x| [x.name, x.id]} || []), {include_blank: 'What other transition you want to do the assignment for this transition?'}, class: "form-control custom-select" %>
+    </div>
+  </div>
+  </div>
+
   <div class="card">
   <h5 class="card-header">Callbacks</h5>
     <div class="card-body">

data/app/views/wf/transitions/show.html.erb

@@ -45,6 +45,17 @@
         </td>
       </tr>
 
+      <tr>
+        <th>Dynamic Assign By</th>
+        <td>
+            <% if @transition.dynamic_assign_by %>
+              <%= link_to @transition.dynamic_assign_by.name, workflow_transition_path(@workflow, @transition.dynamic_assign_by_id) %>
+            <% else %>
+              No
+            <% end %>
+        </td>
+      </tr>
+
       <tr>
         <th scope="row">Multiple Instance?</th>
         <td><%= @transition.multiple_instance %></td>

data/app/views/wf/workflows/show.html.erb

@@ -126,7 +126,7 @@
       <% @workflow.transitions.each do |transition| %>
         <tr>
           <td><%= transition.id %></td>
-          <td><%= transition.name %></td>
+          <td><%= link_to transition.name, workflow_transition_path(@workflow, transition) %></td>
           <td><%= transition.description %></td>
           <td><%= transition.trigger_limit %></td>
           <td><%= transition.trigger_type %></td>

data/app/views/wf/workitems/pre_finish.html.erb

@@ -16,6 +16,16 @@
     </article>
   <% end %>
   
+  <% @workitem.transition.dynamic_assignments.each do |tt| %>
+    <%= f.fields_for :dynamic_assignments do |ff| %>
+       <div class="form-group">
+         <%= ff.label "Assign #{tt.name}", class: "label" %>
+         <%= ff.select tt.id, Wf::Party.all.map{|x| [x.party_name, x.id]}, {}, class: "form-control custom-select" %>
+       </div>
+    <% end %>
+  <% end %>
+
+  
   <% if @workitem.transition.form %>
     <%= f.fields_for :entry do |ff| %>
       <% @workitem.transition.form.fields.each do |field| %>

data/db/migrate/20200226195134_add_dynamic_assign_by.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDynamicAssignBy < ActiveRecord::Migration[6.0]
+  def change
+    add_column :wf_transitions, :dynamic_assign_by_id, :bigint, comment: "dynamic assign by other transition", index: true
+  end
+end

data/lib/wf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wf
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petri_flow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hooopo Wang
@@ -361,6 +361,7 @@ files:
 - db/migrate/20200220070839_remove_unused_column.rb
 - db/migrate/20200220072512_add_sub_workflow.rb
 - db/migrate/20200222150432_add_multi_instance.rb
+- db/migrate/20200226195134_add_dynamic_assign_by.rb
 - lib/tasks/wf_tasks.rake
 - lib/wf.rb
 - lib/wf/engine.rb