Skip to content

Commit

Permalink
update 14 to fix issue #1143
Browse files Browse the repository at this point in the history
  • Loading branch information
brunobuzzi committed Jul 31, 2020
1 parent cf77a42 commit 29cb294
Show file tree
Hide file tree
Showing 36 changed files with 64 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
roles
rolesCollect: aBlock

^roles collect: aBlock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Accessing
roles
rolesDo: aBlock

roles do: aBlock
^roles rolesDo: aBlock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
roles
rolesIfEmpty: aBlock ifNotEmpty: notEmptyBlock

^roles rolesIfEmpty: aBlock ifNotEmpty: notEmptyBlock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
inform
getRolesToInformOn: actionName
rolesToInformOn: actionName
"Answer a collection of roles <BpmFrontOfficeRole> to inform when the action named <actionName> is performed"

^informTo at: actionName ifAbsent: [#()]
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"getNextTimers" : "brunobb 10/10/2018 09:53",
"getNextTransitionForArtifactNamed:ifNone:" : "brunobb 10/17/2018 12:31",
"getPreviousFields" : "BrunoBB 06/18/2016 11:40",
"getRolesToInformOn:" : "brunobb 05/02/2018 04:41",
"grantRole:" : "brunobb 07/01/2019 12:43",
"hasAnyTimerAsNextArtifact" : "brunobb 10/10/2018 09:51",
"hasAttachedEvents" : "brunobb 10/17/2017 12:39",
Expand Down Expand Up @@ -82,7 +81,10 @@
"roles" : "BrunoBB 10/29/2015 14:22",
"roles:" : "BrunoBB 10/29/2015 14:22",
"rolesAnySatisfy:" : "bruno 07/24/2020 13:12",
"rolesDo:" : "bruno 07/24/2020 12:32",
"rolesCollect:" : "brunobb 07/31/2020 10:45",
"rolesDo:" : "brunobb 07/31/2020 10:50",
"rolesIfEmpty:ifNotEmpty:" : "brunobb 07/31/2020 10:49",
"rolesToInformOn:" : "brunobb 07/31/2020 10:43",
"setExtendedAttribute:value:" : "brunobb 07/01/2019 12:41",
"setExtendedAttributesWith:" : "brunobb 07/30/2017 14:27",
"summaryFields" : "BrunoBB 06/18/2016 14:49",
Expand Down
2 changes: 1 addition & 1 deletion repository/BpmCore.package/monticello.meta/version

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ getGrantedUsers

grantedUsers := OrderedCollection new.

self getRoles do: [:eachRole | grantedUsers addAll: eachRole getAllGrantedUsers].
self rolesDo: [:eachRole | grantedUsers addAll: eachRole getAllGrantedUsers].

^grantedUsers
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
other
getRoles
roles
roles
"Answer a collection of the granted roles of the receiver"

^definition roles
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
roles
rolesCollect: aBlock

^definition rolesCollect: aBlock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
roles
rolesDo: aBlock

definition rolesDo: aBlock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
roles
rolesIfEmpty: aBlock ifNotEmpty: notEmptyBlock

^definition rolesIfEmpty: aBlock ifNotEmpty: notEmptyBlock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
inform
getRolesToInformOn: actionName
rolesToInformOn: actionName
"Answer a collection of roles <BpmFrontOfficeRole> to inform when the action named <actionName> is performed"

^task getRolesToInformOn: actionName
^definition rolesToInformOn: actionName
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,14 @@
"getDefinitionName" : "brunobb 10/18/2019 08:00",
"getExpectedTimeWarningColor" : "brunobb 10/18/2019 08:00",
"getFirstPerformerIfNone:" : "brunobb 10/18/2019 08:00",
"getGrantedUsers" : "brunobb 02/02/2020 12:17",
"getGrantedUsers" : "brunobb 07/31/2020 10:50",
"getInTrasitionDefinitions" : "brunobb 10/18/2019 08:00",
"getNextArtifactDefinitionNamed:ifNone:" : "brunobb 10/18/2019 08:00",
"getNextPerformerIfNone:" : "brunobb 10/18/2019 08:00",
"getNextRoleIfNone:" : "brunobb 10/18/2019 08:00",
"getNextTimers" : "brunobb 10/18/2019 08:00",
"getNextTransitionDefinitionForArtifactNamed:ifNone:" : "brunobb 10/18/2019 08:00",
"getOutTransitionDefinitions" : "brunobb 10/18/2019 08:00",
"getRoles" : "brunobb 10/18/2019 08:00",
"getRolesToInformOn:" : "brunobb 10/18/2019 08:00",
"getSummaryFieldsValues" : "brunobb 10/18/2019 08:00",
"getTotalTime" : "brunobb 10/18/2019 08:00",
"getUserName" : "brunobb 10/18/2019 08:00",
Expand Down Expand Up @@ -106,6 +104,11 @@
"processIsRunning" : "brunobb 10/18/2019 08:00",
"processName" : "brunobb 10/18/2019 08:00",
"removeLastWorker" : "brunobb 10/18/2019 08:00",
"roles" : "brunobb 07/31/2020 10:36",
"rolesCollect:" : "brunobb 07/31/2020 10:47",
"rolesDo:" : "brunobb 07/31/2020 10:49",
"rolesIfEmpty:ifNotEmpty:" : "brunobb 07/31/2020 10:48",
"rolesToInformOn:" : "brunobb 07/31/2020 10:42",
"serviceIds" : "brunobb 10/18/2019 08:00",
"signal:" : "brunobb 10/18/2019 08:00",
"state" : "brunobb 10/18/2019 08:00",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sendInformationMessage

message := BpmAssignmentInternalMessage newFromApplicationIn: self bpmEnvironment.

message to: (assignment getRolesToInformOn: #cancelation);
message to: (assignment rolesToInformOn: #cancelation);
subject: ('Assignment Canceled in [', assignment processName, ']');
setValuesFrom: assignment.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"canceller" : "brunobb 08/02/2019 12:14",
"canceller:" : "brunobb 08/02/2019 12:14",
"executeIt" : "brunobb 02/06/2020 10:36",
"sendInformationMessage" : "brunobb 08/02/2019 12:14" } }
"sendInformationMessage" : "brunobb 07/31/2020 10:40" } }
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sendInformationMessage

message := BpmAssignmentInternalMessage newFromApplicationIn: self bpmEnvironment.

message to: (assignment getRolesToInformOn: #finalization);
message to: (assignment rolesToInformOn: #finalization);
subject: ('Assignment Finalization in [', assignment processName, ']');
setValuesFrom: assignment.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"isFinalized" : "brunobb 08/22/2019 10:07",
"isFinalized:" : "brunobb 08/22/2019 10:07",
"process" : "brunobb 08/22/2019 10:07",
"sendInformationMessage" : "brunobb 08/22/2019 10:07" } }
"sendInformationMessage" : "brunobb 07/31/2020 10:40" } }
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sendInformationMessage

message := BpmAssignmentInternalMessage newFromApplicationIn: self bpmEnvironment.

message to: (assignment getRolesToInformOn: #take);
message to: (assignment rolesToInformOn: #take);
subject: ('Assignment Taken in [', assignment processName, ']');
setValuesFrom: assignment.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
},
"instance" : {
"executeIt" : "brunobb 07/31/2019 11:53",
"sendInformationMessage" : "brunobb 09/07/2018 10:28" } }
"sendInformationMessage" : "brunobb 07/31/2020 10:40" } }
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
inform
getRolesToInformOn: actionName
rolesToInformOn: actionName
"Answer a collection of roles <BpmFrontOfficeRole> to inform when the action named <actionName> is performed"

^definition getRolesToInformOn: actionName
^task rolesToInformOn: actionName
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"getProcessMapStreamFor:" : "brunobb 09/07/2018 11:12",
"getProcessesTreeAsCollection" : "brunobb 09/07/2018 11:12",
"getRoleName" : "brunobb 09/07/2018 11:12",
"getRolesToInformOn:" : "brunobb 09/07/2018 11:12",
"getRunningArtifacts" : "brunobb 09/07/2018 11:12",
"getTopProcess" : "brunobb 09/07/2018 11:12",
"getUsername" : "brunobb 09/07/2018 11:12",
Expand Down Expand Up @@ -100,6 +99,7 @@
"role:" : "brunobb 09/07/2018 11:12",
"roleName" : "brunobb 09/07/2018 11:12",
"roleName:" : "brunobb 09/07/2018 11:12",
"rolesToInformOn:" : "brunobb 07/31/2020 10:40",
"setAssignationDate" : "brunobb 09/07/2018 11:12",
"setProcess:" : "brunobb 09/07/2018 11:12",
"setTask:" : "brunobb 07/31/2019 12:01",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sendInformationMessageFor: aBpmTaskAssignment

message := BpmAssignmentInternalMessage newFromApplicationIn: self bpmEnvironment.

message to: (aBpmTaskAssignment getRolesToInformOn: #creation);
message to: (aBpmTaskAssignment rolesToInformOn: #creation);
subject: ('Assignment Creation in [', aBpmTaskAssignment processName, ']');
setValuesFrom: aBpmTaskAssignment.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
"removeLastWorker" : "brunobb 08/30/2019 08:40",
"renderHtmlOn:for:" : "brunobb 08/30/2019 08:40",
"rolesWhoWorked" : "brunobb 08/30/2019 08:40",
"sendInformationMessageFor:" : "brunobb 08/30/2019 08:40",
"sendInformationMessageFor:" : "brunobb 07/31/2020 10:40",
"setExternalObject" : "brunobb 08/30/2019 08:40",
"usersWhoWorked" : "brunobb 08/30/2019 08:40" } }
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ addTask: aBpmTaskInstance
newAssignments :=
aBpmTaskInstance hasPerformers "size > 1- In order to use <performers> there must be at least two <performers>"
ifFalse: [ "the roles of the task are used to create assignments"
aBpmTaskInstance getRoles collect: [:eachRole | self createAssingmentForRole: eachRole inTask: aBpmTaskInstance.
aBpmTaskInstance rolesCollect: [:eachRole | self createAssingmentForRole: eachRole inTask: aBpmTaskInstance.
]
]
ifTrue: ["the performers of the task are used to create assignments"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ getAssignmentFor: aBpmTaskInstance ifNone: aBlock

responsible := aBpmTaskInstance hasPerformers
ifTrue: [aBpmTaskInstance performers] "check in performers for the <BpmTaskAssignment> of task <BpmTaskInstance>"
ifFalse: [aBpmTaskInstance getRoles]. "check in roles for the <BpmTaskAssignment> of task <BpmTaskInstance>"
ifFalse: [aBpmTaskInstance roles]. "check in roles for the <BpmTaskAssignment> of task <BpmTaskInstance>"

responsible do: [:eachRole |
(self getAvailableTasksFor: eachRole name) do: [:assignTask | (assignTask task == aBpmTaskInstance) ifTrue: [^assignTask]]].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"instance" : {
"addAssignment:" : "brunobb 02/06/2020 11:08",
"addAssignment:forRoleNamed:" : "brunobb 02/06/2020 11:08",
"addTask:" : "brunobb 02/06/2020 11:08",
"addTask:" : "brunobb 07/31/2020 10:46",
"application" : "brunobb 02/06/2020 11:08",
"application:" : "brunobb 02/06/2020 11:08",
"applyAssignationPolicyOn:" : "brunobb 02/06/2020 11:08",
"createAssingmentForRole:inTask:" : "brunobb 02/06/2020 11:08",
"createSlotFor:" : "brunobb 02/06/2020 11:08",
"getAllAssignments" : "brunobb 02/06/2020 11:08",
"getAssignmentFor:" : "brunobb 02/06/2020 11:08",
"getAssignmentFor:ifNone:" : "brunobb 02/06/2020 11:08",
"getAssignmentFor:ifNone:" : "brunobb 07/31/2020 10:37",
"getAvailableTasksFor:" : "brunobb 02/06/2020 11:08",
"getAvailableTasksFor:satisfying:" : "brunobb 02/06/2020 11:08",
"includesAssignment:" : "brunobb 02/06/2020 11:08",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sendInformationMessage

message := BpmAssignmentInternalMessage newFromApplicationIn: self bpmEnvironment.

message to: (assignment getRolesToInformOn: #untake);
message to: (assignment rolesToInformOn: #untake);
subject: ('Assignment Released in [', assignment processName, ']');
setValuesFrom: assignment.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
},
"instance" : {
"executeIt" : "brunobb 08/30/2019 17:58",
"sendInformationMessage" : "brunobb 09/07/2018 10:28" } }
"sendInformationMessage" : "brunobb 07/31/2020 10:40" } }
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaultAction
message := BpmProcessInternalMessage newFromApplicationIn: self getProcessInstance bpmEnvironment.

toUsers := OrderedCollection new.
bpmArtifact getRoles do: [:eachRole | toUsers addAll: eachRole users].
bpmArtifact rolesDo: [:eachRole | toUsers addAll: eachRole users].

message to: toUsers;
subject: 'No Next Artifact to Run';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"instance" : {
"bpmArtifact" : "brunobb 11/28/2018 06:45",
"bpmArtifact:" : "brunobb 11/28/2018 06:45",
"defaultAction" : "brunobb 11/28/2018 06:45",
"defaultAction" : "brunobb 07/31/2020 10:50",
"getProcessInstance" : "brunobb 11/28/2018 06:45" } }
2 changes: 1 addition & 1 deletion repository/BpmRuntime.package/monticello.meta/version

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ associateFormWithTask: aBpmTaskInstance forProcess: aBpmProcessInstace

formInstance := aBpmTaskInstance externalObject.

role := aBpmTaskInstance getRoles ifEmpty: [TaskWithNoRoleException signal: 'No roles for this task' ] ifNotEmpty: [:value | value first].
role := aBpmTaskInstance rolesIfEmpty: [TaskWithNoRoleException signal: 'No roles for this task' ] ifNotEmpty: [:value | value first].

assigment := (BpmTaskAssignment
newFor: aBpmProcessInstace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"associateFormWithTask:forProcess:" : "brunobb 12/04/2018 09:10",
"associateFormWithTask:forProcess:" : "brunobb 07/31/2020 10:47",
"doIt" : "brunobb 02/05/2020 03:33",
"newBpmProcess" : "brunobb 12/04/2018 09:10",
"newBpmProcess:" : "brunobb 12/04/2018 09:10",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sendInformationMessageFor: aBpmTaskAssignment

message := BpmAssignmentInternalMessage newFromApplicationIn: aBpmTaskAssignment bpmEnvironment.

message to: (aBpmTaskAssignment getRolesToInformOn: #modification);
message to: (aBpmTaskAssignment rolesToInformOn: #modification);
subject: ('Assignment Modification in [', aBpmTaskAssignment processName, ']');
setValuesFrom: aBpmTaskAssignment .

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"orbeonFormInstance" : "brunobb 12/04/2018 04:16",
"orbeonFormInstance:" : "brunobb 12/04/2018 04:16",
"processAndRedirectForm:" : "brunobb 04/03/2020 13:34",
"sendInformationMessageFor:" : "brunobb 12/04/2018 04:16",
"sendInformationMessageFor:" : "brunobb 07/31/2020 10:40",
"valid" : "brunobb 12/04/2018 04:16",
"valid:" : "brunobb 12/04/2018 04:16" } }
Loading

0 comments on commit 29cb294

Please sign in to comment.