Skip to content

Improve workeffort team support #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eigood wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improve workeffort team support #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f2d08a
Improve team support for WorkEffort and Request.
eigood Jan 8, 2024
7d43c0f
Add Team support to Events and Tasks.
eigood May 15, 2024
a7bc821
Add teamMemberFromDate/teamMemberThruDate to the view.
eigood May 28, 2024
097f9ff
Merge remote-tracking branch 'origin/vendor-master' into improve-work…
eigood Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions entity/RequestViewEntities.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,12 @@ along with this software (see the LICENSE.md file). If not, see
<member-entity entity-alias="REQ" entity-name="mantle.request.Request"/>
<member-entity entity-alias="RQP" entity-name="mantle.request.RequestParty" join-from-alias="REQ" join-optional="true">
<key-map field-name="requestId"/></member-entity>
<member-entity entity-alias="TPR" entity-name="mantle.party.PartyRelationship" join-from-alias="RQP" join-optional="true">
<key-map field-name="partyId" related="toPartyId"/></member-entity>
<alias-all entity-alias="REQ"/>
<alias-all entity-alias="RQP"/>
<alias-all entity-alias="TPR" prefix="teamRelationship"/>
<alias name="teamMemberPartyId" entity-alias="TPR" field="fromPartyId"/>
</view-entity>
<view-entity entity-name="RequestPartyAndPerson" package="mantle.request">
<member-entity entity-alias="RQP" entity-name="mantle.request.RequestParty"/>
Expand Down
20 changes: 16 additions & 4 deletions entity/WorkEffortViewEntities.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,16 @@ along with this software (see the LICENSE.md file). If not, see
<member-entity entity-alias="WEFF_ROOT" entity-name="mantle.work.effort.WorkEffort"/>
<member-entity entity-alias="WEP" entity-name="mantle.work.effort.WorkEffortParty" join-from-alias="WEFF_ROOT">
<key-map field-name="workEffortId"/></member-entity>
<member-entity entity-alias="TPR" entity-name="mantle.party.PartyRelationship" join-from-alias="WEP" join-optional="true">
<key-map field-name="partyId" related="toPartyId"/></member-entity>
<member-entity entity-alias="WEFF" entity-name="mantle.work.effort.WorkEffort" join-from-alias="WEFF_ROOT">
<key-map field-name="workEffortId" related="rootWorkEffortId"/></member-entity>
<alias-all entity-alias="WEFF_ROOT" prefix="root"><exclude field="workEffortId"/></alias-all>
<alias-all entity-alias="WEFF"><exclude field="workTypeEnumId"/></alias-all>
<alias-all entity-alias="WEP"><exclude field="statusId"/></alias-all>
<alias-all entity-alias="TPR" prefix="teamRelationship"/>
<alias entity-alias="WEP" name="wepStatusId" field="statusId"/>
<alias name="teamMemberPartyId" entity-alias="TPR" field="fromPartyId"/>
</view-entity>

<view-entity entity-name="WorkEffortAndCategoryAppl" package="mantle.work.effort">
Expand Down Expand Up @@ -161,9 +165,13 @@ along with this software (see the LICENSE.md file). If not, see
<member-entity entity-alias="WEFF" entity-name="mantle.work.effort.WorkEffort"/>
<member-entity entity-alias="WEP" entity-name="mantle.work.effort.WorkEffortParty" join-from-alias="WEFF" join-optional="true">
<key-map field-name="workEffortId"/></member-entity>
<member-entity entity-alias="TPR" entity-name="mantle.party.PartyRelationship" join-from-alias="WEP" join-optional="true">
<key-map field-name="partyId" related="toPartyId"/></member-entity>
<alias-all entity-alias="WEFF"><exclude field="workTypeEnumId"/></alias-all>
<alias-all entity-alias="WEP"><exclude field="statusId"/></alias-all>
<alias-all entity-alias="TPR" prefix="teamRelationship"/>
<alias name="partyStatusId" entity-alias="WEP" field="statusId"/>
<alias name="teamMemberPartyId" entity-alias="TPR" field="fromPartyId"/>
</view-entity>
<view-entity entity-name="WorkEffortPartyAndPerson" package="mantle.work.effort">
<member-entity entity-alias="WEP" entity-name="mantle.work.effort.WorkEffortParty"/>
Expand Down Expand Up @@ -212,9 +220,7 @@ along with this software (see the LICENSE.md file). If not, see
<member-entity entity-alias="WEFF" entity-name="mantle.work.effort.WorkEffort"/>
<member-entity entity-alias="WEP" entity-name="mantle.work.effort.WorkEffortParty" join-from-alias="WEFF" join-optional="true">
<key-map field-name="workEffortId"/></member-entity>
<member-entity entity-alias="WETP" entity-name="mantle.work.effort.WorkEffortParty" join-from-alias="WEFF" join-optional="true">
<key-map field-name="workEffortId"/></member-entity>
<member-entity entity-alias="TPR" entity-name="mantle.party.PartyRelationship" join-from-alias="WETP" join-optional="true">
<member-entity entity-alias="TPR" entity-name="mantle.party.PartyRelationship" join-from-alias="WEP" join-optional="true">
<key-map field-name="partyId" related="toPartyId"/></member-entity>
<member-entity entity-alias="WEFF_ASSOC" entity-name="mantle.work.effort.WorkEffortAssoc" join-from-alias="WEFF" join-optional="true">
<key-map field-name="workEffortId" related="toWorkEffortId"/></member-entity>
Expand All @@ -224,7 +230,7 @@ along with this software (see the LICENSE.md file). If not, see
<alias-all entity-alias="WEFF"><exclude field="workTypeEnumId"/></alias-all>
<alias-all entity-alias="WEFF_MLSTN" prefix="milestone"/>
<alias-all entity-alias="WEP"><exclude field="statusId"/></alias-all>
<alias-all entity-alias="WETP" prefix="team"/>
<alias-all entity-alias="TPR" prefix="teamRelationship"/>

<alias name="lastUpdatedStamp" entity-alias="WEFF"/>
<alias name="partyStatusId" entity-alias="WEP" field="statusId"/>
Expand All @@ -247,18 +253,24 @@ along with this software (see the LICENSE.md file). If not, see
<member-entity entity-alias="WEFF" entity-name="mantle.work.effort.WorkEffort"/>
<member-entity entity-alias="WEP" entity-name="mantle.work.effort.WorkEffortParty" join-from-alias="WEFF" join-optional="true">
<key-map field-name="workEffortId"/></member-entity>
<member-entity entity-alias="TPR" entity-name="mantle.party.PartyRelationship" join-from-alias="WEP" join-optional="true">
<key-map field-name="partyId" related="toPartyId"/></member-entity>
<member-entity entity-alias="WEAA" entity-name="mantle.work.effort.WorkEffortAssetAssign" join-from-alias="WEFF" join-optional="true">
<key-map field-name="workEffortId"/></member-entity>
<alias-all entity-alias="WEFF"><exclude field="workTypeEnumId"/></alias-all>
<alias-all entity-alias="WEP"><exclude field="fromDate"/><exclude field="thruDate"/><exclude field="statusId"/></alias-all>
<alias-all entity-alias="WEAA"><exclude field="fromDate"/><exclude field="thruDate"/><exclude field="statusId"/>
<exclude field="comments"/></alias-all>
<alias-all entity-alias="TPR" prefix="teamRelationship"/>
<alias name="partyStatusId" entity-alias="WEP" field="statusId"/>
<alias name="partyFromDate" entity-alias="WEP" field="fromDate"/>
<alias name="partyThruDate" entity-alias="WEP" field="thruDate"/>
<alias name="assetStatusId" entity-alias="WEP" field="statusId"/>
<alias name="assetFromDate" entity-alias="WEP" field="fromDate"/>
<alias name="assetThruDate" entity-alias="WEP" field="thruDate"/>
<alias name="teamMemberPartyId" entity-alias="TPR" field="fromPartyId"/>
<alias name="teamMemberFromDate" entity-alias="TPR" field="fromDate"/>
<alias name="teamMemberThruDate" entity-alias="TPR" field="thruDate"/>
<relationship type="one" title="WorkEffortPurpose" related="moqui.basic.Enumeration">
<key-map field-name="purposeEnumId"/></relationship>
</view-entity>
Expand Down
1 change: 1 addition & 0 deletions service/mantle/work/EventServices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ along with this software (see the LICENSE.md file). If not, see
<econdition field-name="assetId" operator="in" from="assetIdSet" ignore-if-empty="true"/>
<econdition field-name="ownerPartyId" operator="in" from="partyIdSet" ignore-if-empty="true"/>
<econdition field-name="partyId" operator="in" from="partyIdSet" ignore-if-empty="true"/>
<econdition field-name="teamMemberPartyId" operator="in" from="partyIdSet" ignore-if-empty="true"/>
</econditions>
<!-- for events look for start date within the range -->
<econditions combine="or">
Expand Down
1 change: 1 addition & 0 deletions service/mantle/work/TaskServices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ along with this software (see the LICENSE.md file). If not, see
<econditions combine="or">
<econdition field-name="ownerPartyId" operator="in" from="partyIdSet" ignore-if-empty="true"/>
<econdition field-name="partyId" operator="in" from="partyIdSet" ignore-if-empty="true"/>
<econdition field-name="teamMemberPartyId" operator="in" from="partyIdSet" ignore-if-empty="true"/>
</econditions>
<!-- for tasks look for completion date within the range -->
<econditions combine="or">
Expand Down