Skip to content
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

Improve team assignment support in several locations. #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve team assignment support in several locations. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion screen/HiveMindRoot/dashboard/MyMilestones.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ along with this software (see the LICENSE.md file). If not, see
<actions>
<entity-find entity-name="WorkEffortAndRootByParty" list="myMilestoneList" distinct="true">
<date-filter/>
<econdition field-name="partyId" from="ec.user.userAccount.partyId"/>
<econditions combine="or">
<econdition field-name="partyId" from="ec.user.userAccount.partyId"/>
<econditions>
<date-filter from-field-name="teamRelationshipFromDate" thru-field-name="teamRelationshipThruDate"/>
<econdition field-name="teamMemberPartyId" from="ec.user.userAccount.partyId"/>
</econditions>
</econditions>
<econdition field-name="rootWorkEffortTypeEnumId" value="WetProject"/>
<econdition field-name="rootStatusId" operator="not-in" value="WeClosed,WeCancelled"/>
<econdition field-name="workEffortTypeEnumId" value="WetMilestone"/>
Expand Down
11 changes: 10 additions & 1 deletion screen/HiveMindRoot/dashboard/MyProjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,16 @@ along with this software (see the LICENSE.md file). If not, see
<entity-find entity-name="mantle.work.effort.WorkEffortAndParty" list="myProjectList" distinct="true">
<econditions combine="or">
<econdition field-name="visibilityEnumId" operator="in" value="WevGeneral,WevAllUsers"/>
<econditions><date-filter/><econdition field-name="partyId" from="ec.user.userAccount.partyId"/></econditions>
<econditions>
<date-filter/>
<econditions combine="or">
<econdition field-name="partyId" from="ec.user.userAccount.partyId"/>
<econditions>
<date-filter from-field-name="teamRelationshipFromDate" thru-field-name="teamRelationshipThruDate"/>
<econdition field-name="teamMemberPartyId" from="ec.user.userAccount.partyId"/>
</econditions>
</econditions>
</econditions>
</econditions>
<econdition field-name="workEffortTypeEnumId" value="WetProject"/>
<select-field field-name="workEffortId,workEffortName,estimatedStartDate,statusId"/>
Expand Down
8 changes: 7 additions & 1 deletion screen/HiveMindRoot/dashboard/MyRequests.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ along with this software (see the LICENSE.md file). If not, see
<form-list name="MyRequests" list="myRequestList">
<entity-find entity-name="mantle.request.RequestAndParty" list="myRequestList" distinct="true">
<date-filter/>
<econdition field-name="partyId" from="ec.user.userAccount.partyId"/>
<econditions combine="or">
<econdition field-name="partyId" from="ec.user.userAccount.partyId"/>
<econditions>
<date-filter from-field-name="teamRelationshipFromDate" thru-field-name="teamRelationshipThruDate"/>
<econdition field-name="teamMemberPartyId" from="ec.user.userAccount.partyId"/>
</econditions>
</econditions>
<econdition field-name="statusId" operator="not-in" value="ReqCompleted,ReqCancelled"/>
<select-field field-name="requestName"/><order-by field-name="priority"/>
</entity-find>
Expand Down
9 changes: 8 additions & 1 deletion screen/HiveMindRoot/dashboard/MyTasks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@ along with this software (see the LICENSE.md file). If not, see
</box-toolbar><box-body>
<form-list name="MyTasks" list="myTaskList">
<entity-find entity-name="mantle.work.effort.PartyTaskSummary" list="myTaskList" distinct="true">
<date-filter/><econdition field-name="partyId" from="ec.user.userAccount.partyId"/>
<date-filter/>
<econditions combine="or">
<econdition field-name="partyId" from="ec.user.userAccount.partyId"/>
<econditions>
<date-filter from-field-name="teamRelationshipFromDate" thru-field-name="teamRelationshipThruDate"/>
<econdition field-name="teamMemberPartyId" from="ec.user.userAccount.partyId"/>
</econditions>
</econditions>
<econdition field-name="statusId" operator="not-in" value="WeClosed,WeCancelled"/>
<econdition field-name="purposeEnumId" operator="not-equals" value="WepPlaceholder"/>
<econdition field-name="partyStatusId" operator="in" value="WeptAssigned,WeptArrived"/>
Expand Down