OFBiz › OFBiz - Commits

svn commit: r1768209 [8/9] - in /ofbiz/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/fixedasset/ applications/accounting/minilang/invoice/ applications/accounting/minilang/...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

diveshdutta

svn commit: r1768209 [8/9] - in /ofbiz/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/fixedasset/ applications/accounting/minilang/invoice/ applications/accounting/minilang/...

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml Sat Nov 5 12:41:35 2016
@@ -590,7 +590,7 @@
<set field="hours" value="0" type="Double" />
<set field="planHours" value="0" type="Double" />
<if-not-empty field="timeEntries">
- <iterate entry="timeEntry" list="timeEntries">
+ <iterate list="timeEntries" entry="timeEntry">
<if-compare-field field="timeEntry.workEffortId" to-field="parameters.workEffortId" operator="equals">
<if-compare-field field="timeEntry.timesheetId" to-field="parameters.timesheetId" operator="equals">
<if-compare-field field="timeEntry.partyId" to-field="parameters.partyId" operator="equals">
@@ -687,7 +687,7 @@
<else>

<if-not-empty field="timeEntries">
- <iterate entry="timeEntry" list="timeEntries">
+ <iterate list="timeEntries" entry="timeEntry">
<if-compare-field field="timeEntry.workEffortId" to-field="parameters.workEffortId" operator="equals">
<if-compare-field field="timeEntry.timesheetId" to-field="parameters.timesheetId" operator="equals">
<if-compare-field field="timeEntry.partyId" to-field="parameters.partyId" operator="equals">
@@ -719,19 +719,19 @@
</if-compare>
<if-compare field="parameters.checkComplete" value="Y" operator="equals">
<if-compare field="taskStatus.currentStatusId" value="STS_COMPLETED" operator="equals">
- <if-compare-field operator="not-equals" field="parameters.planHours" to-field="parameters.actualHours" type="Double">
+ <if-compare-field field="parameters.planHours" operator="not-equals" to-field="parameters.actualHours" type="Double">
<set field="parameters.planHours" from-field="parameters.actualHours" />
</if-compare-field>
<else>
<set field="actualMap.taskId" from-field="parameters.workEffortId" />

- <if-compare operator="equals" field="isTaskMeeting" value="Y">
+ <if-compare field="isTaskMeeting" operator="equals" value="Y">
<set field="actualMap.partyId" from-field="userLogin.partyId" />
</if-compare>
<call-service service-name="getScrumActualHour" in-map-name="actualMap">
<result-to-field result-name="actualHours" />
</call-service>
- <if-compare-field operator="not-equals" field="parameters.planHours" to-field="actualHours" type="Double">
+ <if-compare-field field="parameters.planHours" operator="not-equals" to-field="actualHours" type="Double">
<set field="parameters.planHours" from-field="actualHours" />
</if-compare-field>
</else>
@@ -811,7 +811,7 @@
<get-related value-field="timesheet" relation-name="TimeEntry" list="timeEntries" />

<if-not-empty field="timeEntries">
- <iterate entry="timeEntry" list="timeEntries">
+ <iterate list="timeEntries" entry="timeEntry">
<if-compare-field field="timeEntry.workEffortId" to-field="parameters.workEffortId" operator="equals">
<if-compare-field field="timeEntry.timesheetId" to-field="parameters.timesheetId" operator="equals">
<if-compare-field field="timeEntry.partyId" to-field="parameters.partyId" operator="equals">
@@ -826,7 +826,7 @@
</if-compare>


- <entity-and list="custRequestWorkEffortList" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffortList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<first-from-list entry="custRequestWorkEffortMap" list="custRequestWorkEffortList"/>
@@ -953,7 +953,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<set field="taskIdCond[+0]" from-field="task.taskId" />
</iterate>
<entity-condition list="timeEntries" entity-name="TimeEntry">
@@ -975,7 +975,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<set field="taskIdCond[+0]" from-field="task.workEffortId" />
</iterate>
<entity-condition list="timeEntries" entity-name="TimeEntry">
@@ -998,7 +998,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<set field="taskIdCond[+0]" from-field="task.workEffortId" />
</iterate>
<entity-condition list="timeEntries" entity-name="TimeEntry">
@@ -1036,7 +1036,7 @@
</if-not-empty>
<set field="actualHours" type="Double" value="0.0" />
<if-not-empty field="timeEntries">
- <iterate entry="timeEntry" list="timeEntries">
+ <iterate list="timeEntries" entry="timeEntry">
<if-not-empty field="timeEntry.hours">
<calculate field="actualHours" type="Double">
<calcop operator="add" field="timeEntry.hours">
@@ -1048,7 +1048,7 @@
</if-not-empty>
<set field="actualHoursNotBillYet" type="Double" value="0.0" />
<if-not-empty field="listTimeEntriesNotBill">
- <iterate entry="timeEntryNotBill" list="listTimeEntriesNotBill">
+ <iterate list="listTimeEntriesNotBill" entry="timeEntryNotBill">
<if-not-empty field="timeEntryNotBill.partyId">
<entity-and entity-name="PartyRate" list="partyRates" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="timeEntryNotBill.rateTypeId"/>
@@ -1093,7 +1093,7 @@
</if-not-empty>
<set field="actualHours" type="Double" value="0.0" />
<if-not-empty field="timeEntries">
- <iterate entry="timeEntry" list="timeEntries">
+ <iterate list="timeEntries" entry="timeEntry">
<calculate field="actualHours" type="Double">
<calcop operator="add" field="timeEntry.hours">
<calcop operator="get" field="actualHours" />
@@ -1161,7 +1161,7 @@
</entity-one>
<if-not-empty field="assignment">

- <set-nonpk-fields value-field="assignment" map="parameters" />
+ <set-nonpk-fields map="parameters" value-field="assignment" />
<store-value value-field="assignment" />
<if-compare field="assignment.statusId" value="SCAS_COMPLETED"
operator="equals">
@@ -1185,7 +1185,7 @@
</entity-and>

<if-not-empty field="assignments">
- <iterate entry="assignment" list="assignments">
+ <iterate list="assignments" entry="assignment">
<if-compare field="assignment.statusId" value="SCAS_COMPLETED" operator="not-equals">
<set field="status" value="notcomplete" />
</if-compare>
@@ -1222,7 +1222,7 @@
</if-compare>
<set field="invoice.partyId" from-field="parameters.partyId"/>
<store-value value-field="invoice"/>
- <entity-and list="entries" entity-name="TimeEntry">
+ <entity-and entity-name="TimeEntry" list="entries">
<field-map field-name="invoiceId" from-field="parameters.invoiceId" />
</entity-and>
<iterate list="entries" entry="timeEntry">
@@ -1244,7 +1244,7 @@
</condition-list>
<select-field field-name="partyIdTo"/>
</entity-condition>
- <iterate entry="partyRelationship" list="listPartyIdInCompany">
+ <iterate list="listPartyIdInCompany" entry="partyRelationship">
<set field="partyIdAllInCompany[+0]" from-field="partyRelationship.partyIdTo"/>
</iterate>
<if-empty field="partyIdAllInCompany">
@@ -1309,7 +1309,7 @@
<field field="tasks" type="List"/>
<field field="orderBy" type="List"/>
</call-class-method>
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<if-empty field="notFirst">

<set-service-fields service-name="scrumAddWorkEffortTimeToNewInvoice"
@@ -1359,14 +1359,14 @@
<set field="realBillingItemList" type="List"/>
<set field="billingItemListSize" value="${groovy: billingItemList.size();}" type="Double"/>
<if-not-empty field="billingItemList">
- <iterate entry="billingItemMap" list="billingItemList">
+ <iterate list="billingItemList" entry="billingItemMap">
<field-to-list list="billingItemIndexList" field="billingItemMap.invoiceItemSeqId"/>
</iterate>
</if-not-empty>
<if-not-empty field="billingItemIndexList">
<set field="billingItemIndexToSet" value="${groovy: import java.util.Set; new HashSet(billingItemIndexList);}"/>
<set field="billingItemIndexList" from-field="billingItemIndexToSet" />
- <iterate entry="billingItemIndexMap" list="billingItemIndexList">
+ <iterate list="billingItemIndexList" entry="billingItemIndexMap">
<set field="inputMap" type="NewMap"/>
<loop count="${billingItemListSize}" field="i">
<if>
@@ -1386,7 +1386,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="realBillingItemList">
- <iterate entry="realBillingItemMap" list="realBillingItemList">
+ <iterate list="realBillingItemList" entry="realBillingItemMap">
<entity-one value-field="custRequestMap" entity-name="CustRequest">
<field-map field-name="custRequestId" from-field="realBillingItemMap.custRequestId"/>
</entity-one>
@@ -1466,7 +1466,7 @@
<set field="invoiceItemMap.description" value="${groovy:invoiceItemDescription.size()>255?invoiceItemDescription.substring(0,251)+" ...":invoiceItemDescription}"/>
</if-not-empty>
</if-not-empty>
- <iterate entry="timeEntry" list="timeEntryList">
+ <iterate list="timeEntryList" entry="timeEntry">
<if>
<condition>
<or>
@@ -1518,7 +1518,7 @@
<result-to-field result-name="rateAmount"/>
</call-service>

- <entity-and list="existAmountAndDescriptionInvoiceItems" entity-name="InvoiceItem">
+ <entity-and entity-name="InvoiceItem" list="existAmountAndDescriptionInvoiceItems">
<field-map field-name="invoiceId" from-field="invoiceItemMap.invoiceId"/>
<field-map field-name="amount" from-field="rateAmount"/>
<field-map field-name="description" from-field="invoiceItemMap.description"/>
@@ -1596,11 +1596,11 @@
</iterate>
</simple-method>
<simple-method method-name="removeInvoiceInTimeEntry" short-description="Remove Invoice In TimeEntry">
- <entity-and list="timeEntryList" entity-name="TimeEntry">
+ <entity-and entity-name="TimeEntry" list="timeEntryList">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
</entity-and>
<if-not-empty field="timeEntryList">
- <iterate entry="timeEntryMap" list="timeEntryList">
+ <iterate list="timeEntryList" entry="timeEntryMap">
<set field="timeEntryMap.invoiceId" from-field="nullField"/>
<set field="timeEntryMap.invoiceItemSeqId" from-field="nullField"/>
<log level="info" message="Upadte value === >>> timeEntryId = ${timeEntryMap}"></log>
@@ -1740,7 +1740,7 @@
</entity-condition>

<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<set field="parameters.taskId" from-field="task.taskId" />
<call-simple-method method-name="getScrumTaskPlanHour" />
<calculate field="backlogPlanHours" type="Double">
@@ -1766,7 +1766,7 @@
</entity-condition>

<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<set field="parameters.taskId" from-field="task.workEffortId" />
<call-simple-method method-name="getScrumTaskPlanHour" />
<calculate field="backlogPlanHours" type="Double">
@@ -1782,7 +1782,7 @@
<if-compare field="custRequestMap.statusId" operator="equals" value="CRQ_ACCEPTED">
<get-related relation-name="CustRequestWorkEffort" list="custWorkEffList" value-field="custRequestMap"/>
<if-not-empty field="custWorkEffList">
- <iterate entry="task" list="custWorkEffList">
+ <iterate list="custWorkEffList" entry="task">
<set field="parameters.taskId" from-field="task.workEffortId" />
<call-simple-method method-name="getScrumTaskPlanHour" />
<calculate field="backlogPlanHours" type="Double">
@@ -1815,7 +1815,7 @@
list="sprints">
<condition-expr field-name="workEffortId" from-field="parameters.sprintId" />
</entity-condition>
- <iterate entry="sprint" list="sprints">
+ <iterate list="sprints" entry="sprint">
<set field="parameters.custRequestId" from-field="sprint.custRequestId" />
<call-simple-method method-name="getScrumBacklogPlanHour" />
<calculate field="sprintPlanHours" type="Double">
@@ -1841,7 +1841,7 @@
<entity-condition entity-name="CustRequestWorkEffort" list="sprints">
<condition-expr field-name="workEffortId" from-field="parameters.sprintId" />
</entity-condition>
- <iterate entry="sprint" list="sprints">
+ <iterate list="sprints" entry="sprint">
<set field="parameters.custRequestId" from-field="sprint.custRequestId" />
<call-simple-method method-name="getScrumBacklogInitPlanHour" />
<calculate field="sprintInitPlanHours" type="Double">
@@ -1867,7 +1867,7 @@
<condition-expr field-name="workEffortParentId"
from-field="parameters.projectId" />
</entity-condition>
- <iterate entry="sprint" list="sprints">
+ <iterate list="sprints" entry="sprint">
<set field="parameters.sprintId" from-field="sprint.workEffortId" />
<call-simple-method method-name="getScrumSprintPlanHour" />
<calculate field="projectPlanHours" type="Double">
@@ -1893,7 +1893,7 @@
<entity-condition entity-name="WorkEffort" list="sprints">
<condition-expr field-name="workEffortParentId" from-field="parameters.projectId" />
</entity-condition>
- <iterate entry="sprint" list="sprints">
+ <iterate list="sprints" entry="sprint">
<set field="parameters.sprintId" from-field="sprint.workEffortId" />
<call-simple-method method-name="getScrumSprintInitPlanHour" />
<calculate field="projectInitPlanHours" type="Double">
@@ -1937,11 +1937,11 @@
<if-not-empty field="parameters.partyId">
<set field="parameters.hoursPartyId" from-field="parameters.partyId" />
</if-not-empty>
- <entity-and list="projectList" entity-name="WorkEffortAndProduct">
+ <entity-and entity-name="WorkEffortAndProduct" list="projectList">
<field-map field-name="workEffortId" from-field="parameters.projectId" />
</entity-and>
<first-from-list entry="project" list="projectList"/>
- <entity-and list="productRole" entity-name="ProductRole">
+ <entity-and entity-name="ProductRole" list="productRole">
<field-map field-name="productId" from-field="project.productId"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
@@ -2006,7 +2006,7 @@
operator="equals" value="SCRUM_SPRINT" />
</condition-list>
</entity-condition>
- <iterate entry="sprint" list="sprintList">
+ <iterate list="sprintList" entry="sprint">
<set field="currentStatusId" from-field="sprint.currentStatusId" />
<set field="actualCompletionDate" from-field="sprint.actualCompletionDate" />
<now-timestamp field="curDate" />
@@ -2053,7 +2053,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="sprintTaskList">
- <iterate entry="listTaskSprint" list="sprintTaskList">
+ <iterate list="sprintTaskList" entry="listTaskSprint">
<set field="taskID" from-field="listTaskSprint.taskId" />
<set field="updateSprint.workEffortId" from-field="taskID" />
<set field="updateSprint.currentStatusId" value="STS_COMPLETED" />
@@ -2138,7 +2138,7 @@
</condition-list>
</entity-condition>
<set field="totalTaskPlanHours" type="Double" value="0" />
- <iterate entry="checkTask" list="checkTasks">
+ <iterate list="checkTasks" entry="checkTask">
<set field="takCheck.taskId" from-field="checkTask.workEffortId" />
<call-service service-name="getScrumPlanHour"
in-map-name="takCheck">
@@ -2197,7 +2197,7 @@

<set field="newSequenceNum" value="1" type="Long" />
<set field="sequenceNumStep" value="1" type="Long" />
- <iterate entry="custRequestAndCustRequestItem" list="custRequestAndCustRequestItems">
+ <iterate list="custRequestAndCustRequestItems" entry="custRequestAndCustRequestItem">

<entity-one value-field="custRequest" entity-name="CustRequest">
<field-map field-name="custRequestId"
@@ -2217,7 +2217,7 @@
</simple-method>
<simple-method method-name="autoCompleteBacklog"
short-description="Auto Complete Backlog">
- <entity-and list="sprintBacklogs" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="sprintBacklogs">
<field-map field-name="workEffortId" from-field="parameters.workEffortId" />
</entity-and>
<first-from-list entry="sprintBacklog" list="sprintBacklogs" />
@@ -2306,7 +2306,7 @@
<if-compare field="custRequestTypeId" operator="not-equals" value="RF_UNPLAN_BACKLOG">
<get-related relation-name="CustRequestItem" list="custItemList" value-field="custRequest"/>
<first-from-list entry="custItemMap" list="custItemList"/>
- <entity-and list="productRole" entity-name="ProductRole">
+ <entity-and entity-name="ProductRole" list="productRole">
<field-map field-name="productId" from-field="custItemMap.productId"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
@@ -2334,7 +2334,7 @@
</entity-condition>
<if-not-empty field="listCustInSprint">
<set field="countCustInSprint" value="${groovy: listCustInSprint.size()}"/>
- <iterate entry="custInSprint" list="listCustInSprint">
+ <iterate list="listCustInSprint" entry="custInSprint">
<set field="custRequestIdCond[+0]" from-field="custInSprint.custRequestId"/>
</iterate>
<entity-count count-field="countCustIsCompleted" entity-name="CustRequest">
@@ -2347,7 +2347,7 @@
</condition-list>
</condition-list>
</entity-count>
- <if-compare-field operator="equals" field="countCustInSprint" to-field="countCustIsCompleted">
+ <if-compare-field field="countCustInSprint" operator="equals" to-field="countCustIsCompleted">
<set field="updateSprint.workEffortId" from-field="resultWorkEffort.workEffortParentId"/>
<set field="updateSprint.currentStatusId" value="SPRINT_CLOSED"/>
<set field="updateSprint.webSiteId" from-field="parameters.webSiteId"/>
@@ -2451,7 +2451,7 @@
<entity-one value-field="projectMap" entity-name="WorkEffort">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-one>
- <entity-and list="productList" entity-name="WorkEffortAndProduct">
+ <entity-and entity-name="WorkEffortAndProduct" list="productList">
<field-map field-name="workEffortId" from-field="projectMap.workEffortParentId"/>
</entity-and>
<first-from-list entry="productMap" list="productList"/>
@@ -2518,7 +2518,7 @@
</entity-one>
<if-empty field="user">

- <entity-and list="partyIdenList" entity-name="PartyIdentification">
+ <entity-and entity-name="PartyIdentification" list="partyIdenList">
<field-map field-name="idValue" from-field="committer"/>
<field-map field-name="partyIdentificationTypeId" value="SVN_LOGIN"/>
</entity-and>
@@ -2539,7 +2539,7 @@
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
</entity-one>
<if-not-empty field="task">
- <entity-and list="contentRoles" entity-name="ContentRole">
+ <entity-and entity-name="ContentRole" list="contentRoles">
<field-map field-name="partyId" from-field="user.partyId"/>
<field-map field-name="roleTypeId" value="OWNER"/>
</entity-and>
@@ -2648,7 +2648,7 @@
<result-to-field result-name="planHours"/>
</call-service>

- <entity-and list="timeEntryList" entity-name="TimeEntry">
+ <entity-and entity-name="TimeEntry" list="timeEntryList">
<field-map field-name="timesheetId" from-field="timesheetMap.timesheetId"/>
<field-map field-name="partyId" from-field="user.partyId"/>
<field-map field-name="fromDate" from-field="nowStartDate"/>
@@ -2695,7 +2695,7 @@
</if-not-empty>


- <entity-and list="custRequestWorkEffortList" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffortList">
<field-map field-name="workEffortId" from-field="task.workEffortId"/>
</entity-and>
<first-from-list entry="custRequestWorkEffortMap" list="custRequestWorkEffortList"/>

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumTests.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumTests.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumTests.xml Sat Nov 5 12:41:35 2016
@@ -23,7 +23,7 @@ under the License.

<simple-method method-name="testFindProjectWithSearchParameters" short-description="Test find project service on certain search parameters" login-required="false">
<set field="searchParameters.workEffortTypeId" value="SCRUM_PROJECT"/>
- <entity-and list="workEffortList" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="workEffortList">
<field-map field-name="workEffortTypeId" from-field="searchParameters.workEffortTypeId"/>
</entity-and>
</simple-method>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml Sat Nov 5 12:41:35 2016
@@ -516,7 +516,7 @@ under the License.
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-one>
<set field="parameters.projectId" from-field="sprint.workEffortParentId"/>
- <entity-and list="sprintList" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="sprintList">
<field-map field-name="workEffortParentId" from-field="parameters.projectId"/>
<order-by field-name="createdDate"/>
</entity-and>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/OpenTestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/OpenTestScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/OpenTestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/OpenTestScreens.xml Sat Nov 5 12:41:35 2016
@@ -49,7 +49,7 @@ under the License.
<section>
<widgets>
<screenlet title="${uiLabelMap.ScrumDefaultTasksList}">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="DefaultTaskList"/>
+ <include-form name="DefaultTaskList" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -72,7 +72,7 @@ under the License.
<section>
<widgets>
<screenlet title="${uiLabelMap.ScrumEditDefaultTask} ${workEffortId}">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="EditDefaultTask"/>
+ <include-form name="EditDefaultTask" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -87,7 +87,7 @@ under the License.
</actions>
<widgets>
<screenlet id="findBacklog" title="${uiLabelMap.PageTitleFindBacklog}" collapsible="true">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="FindBacklog"/>
+ <include-form name="FindBacklog" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -99,7 +99,7 @@ under the License.
</actions>
<widgets>
<screenlet title="${uiLabelMap.ScrumBacklogList}">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="ListTask"/>
+ <include-form name="ListTask" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -117,7 +117,7 @@ under the License.
<section>
<widgets>
<screenlet title="${uiLabelMap.PageTitleEditTask}">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="EditTask"/>
+ <include-form name="EditTask" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -144,7 +144,7 @@ under the License.
<link text="${uiLabelMap.ScrumCreateDefaultTasks}" target="editDefaultTaskScrum" style="buttontext create"/>
</container>
<screenlet title="${uiLabelMap.ScrumDefaultTasksList}">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="DefaultTaskScrumList"/>
+ <include-form name="DefaultTaskScrumList" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -165,7 +165,7 @@ under the License.
<decorator-section name="body">
<container style="button-bar"/>
<screenlet title="${uiLabelMap.ScrumEditDefaultTask}">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="EditDefaultTaskScrum"/>
+ <include-form name="EditDefaultTaskScrum" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml Sat Nov 5 12:41:35 2016
@@ -309,10 +309,10 @@ under the License.
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet name="findPartyRevision" title="Find Revision">
- <include-form location="component://scrum/widget/ResourceForms.xml" name="FindPartyRevision"/>
+ <include-form name="FindPartyRevision" location="component://scrum/widget/ResourceForms.xml"/>
</screenlet>
<screenlet name="listPartyRevision" title="Revisions list">
- <include-form location="component://scrum/widget/ResourceForms.xml" name="ListPartyRevisions"/>
+ <include-form name="ListPartyRevisions" location="component://scrum/widget/ResourceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -334,7 +334,7 @@ under the License.
<decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyEditPersonalInformation}">
- <include-form location="component://scrum/widget/ResourceForms.xml" name="QuickAddParty"/>
+ <include-form name="QuickAddParty" location="component://scrum/widget/ResourceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -355,7 +355,7 @@ under the License.
<decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.ScrumPartyRelationship}">
- <include-form location="component://scrum/widget/ResourceForms.xml" name="QuickAddPartyRelationship"/>
+ <include-form name="QuickAddPartyRelationship" location="component://scrum/widget/ResourceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -389,7 +389,7 @@ under the License.
<decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditPartyRates}">
- <include-form location="component://scrum/widget/ResourceForms.xml" name="QuickAddPartyRate"/>
+ <include-form name="QuickAddPartyRate" location="component://scrum/widget/ResourceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml Sat Nov 5 12:41:35 2016
@@ -56,7 +56,7 @@ under the License.
</widgets>
</section>
<screenlet name="FindTask" title="${uiLabelMap.PageTitleFindTask}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="FindTask"/>
+ <include-form name="FindTask" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
<section>
<condition>
@@ -64,30 +64,30 @@ under the License.
</condition>
<widgets>
<screenlet name="TasksListError" title="${uiLabelMap.ScrumErrorTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListError"/>
+ <include-form name="TasksListError" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
<screenlet name="TasksListInstall" title="${uiLabelMap.ScrumInstallationTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListInstall"/>
+ <include-form name="TasksListInstall" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
<screenlet name="TasksListTest" title="${uiLabelMap.ScrumTestTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListTest"/>
+ <include-form name="TasksListTest" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
<screenlet name="TasksListCoding" title="${uiLabelMap.ScrumCodingTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListCoding"/>
+ <include-form name="TasksListCoding" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet name="TasksListError" title="${uiLabelMap.ScrumErrorTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListErrorNoAction"/>
+ <include-form name="TasksListErrorNoAction" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
<screenlet name="TasksListInstall" title="${uiLabelMap.ScrumInstallationTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListInstallNoAction"/>
+ <include-form name="TasksListInstallNoAction" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
<screenlet name="TasksListTest" title="${uiLabelMap.ScrumTestTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListTestNoAction"/>
+ <include-form name="TasksListTestNoAction" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
<screenlet name="TasksListCoding" title="${uiLabelMap.ScrumCodingTasksList}" collapsible="true" initially-collapsed="false">
- <include-form location="component://scrum/widget/TaskForms.xml" name="TasksListCodingNoAction"/>
+ <include-form name="TasksListCodingNoAction" location="component://scrum/widget/TaskForms.xml"/>
</screenlet>
</fail-widgets>
</section>
@@ -107,7 +107,7 @@ under the License.
<set field="labelTitleProperty" value="PageTitleEditTaskList"/>
<set field="workEffortId" from-field="parameters.taskId"/>
<entity-one entity-name="WorkEffort" value-field="task"/>
- <entity-and list="custRequestWorkEffort" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffort">
<field-map field-name="workEffortId" from-field="workEffortId"/>
</entity-and>
<set field="parameters.custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/>
@@ -133,7 +133,7 @@ under the License.
<set field="title" value="${uiLabelMap.ScrumRevisions}"/>
<set field="parameters.custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/>
<set field="parameters.noConditionFind" value="Y"/>
- <entity-and list="listIt" entity-name="WorkEffortAndContentDataResource">
+ <entity-and entity-name="WorkEffortAndContentDataResource" list="listIt">
<field-map field-name="workEffortContentTypeId" value="TASK_SUB_INFO"/>
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
<order-by field-name="fromDate"/>
@@ -273,7 +273,7 @@ under the License.
<section>
<actions>
<entity-one value-field="task" entity-name="WorkEffort"/>
- <entity-and list="custRequestWorkEffort" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffort">
<field-map field-name="workEffortId" from-field="workEffortId"/>
</entity-and>
<set field="parameters.custRequestId" from-field="custRequestWorkEffort[0].custRequestId" type="String"/>
@@ -296,7 +296,7 @@ under the License.
</condition-list>
</entity-condition>
<set field="sprintId" from-field="SprintTasks[3].sprintId"/>
- <entity-and list="sprintMembers" entity-name="WorkEffortPartyAssignment">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="sprintMembers">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-and>
</actions>
@@ -317,11 +317,11 @@ under the License.
<set field="titleProperty" value="ScrumTaskSummary"/>
<set field="tabButtonItem" value="taskView"/>
<set field="workEffortId" from-field="parameters.taskId"/>
- <entity-and list="custRequestWorkEffort" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffort">
<field-map field-name="workEffortId" from-field="workEffortId"/>
</entity-and>
<set field="custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/>
- <entity-and list="notes" entity-name="CustRequestNoteView">
+ <entity-and entity-name="CustRequestNoteView" list="notes">
<field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-and>
<set field="sprintId" from-field="parameters.sprintId"/>
@@ -338,7 +338,7 @@ under the License.
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.ScrumTaskAttachements}">
- <include-form location="component://scrum/widget/OpenTestForms.xml" name="ContentTask"/>
+ <include-form name="ContentTask" location="component://scrum/widget/OpenTestForms.xml"/>
</screenlet>
<include-screen name="TaskNoteInfo"/>
<screenlet title="${uiLabelMap.PageTitleTaskMember}">
@@ -357,7 +357,7 @@ under the License.
<set field="tabButtonItem" value="taskNote"/>
<set field="workEffortId" from-field="parameters.taskId"/>
<set field="taskId" from-field="parameters.taskId"/>
- <entity-and list="workNoteList" entity-name="WorkEffortNote">
+ <entity-and entity-name="WorkEffortNote" list="workNoteList">
<field-map field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="-noteId"/>
</entity-and>
@@ -400,10 +400,10 @@ under the License.
<if-service-permission service-name="scrumPermissionCheck" main-action="UPDATE" resource-description="TASK"/>
</condition>
<widgets>
- <include-form location="component://scrum/widget/TaskForms.xml" name="TaskMemberListInfo"/>
+ <include-form name="TaskMemberListInfo" location="component://scrum/widget/TaskForms.xml"/>
</widgets>
<fail-widgets>
- <include-form location="component://scrum/widget/TaskForms.xml" name="TaskMemberListInfoForStakeholder"/>
+ <include-form name="TaskMemberListInfoForStakeholder" location="component://scrum/widget/TaskForms.xml"/>
</fail-widgets>
</section>
</screen>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml Sat Nov 5 12:41:35 2016
@@ -181,7 +181,7 @@ under the License.
<condition>
<and>
<if-compare-field operator="less-equals" field="nowTimestamp" to-field="sprint.actualCompletionDate" type="Timestamp"/>
- <if-compare operator="not-equals" field="sprint.currentStatusId" value="SPRINT_CLOSED"/>
+ <if-compare field="sprint.currentStatusId" operator="not-equals" value="SPRINT_CLOSED"/>
<if-service-permission service-name="scrumPermissionCheck" main-action="UPDATE" resource-description="SPRINT"/>
</and>
</condition>
@@ -193,7 +193,7 @@ under the License.
<condition>
<and>
<if-compare-field operator="greater-equals" field="nowTimestamp" to-field="sprint.actualCompletionDate" type="Timestamp"/>
- <if-compare operator="not-equals" field="sprint.currentStatusId" value="SPRINT_CLOSED"/>
+ <if-compare field="sprint.currentStatusId" operator="not-equals" value="SPRINT_CLOSED"/>
<if-service-permission service-name="scrumPermissionCheck" main-action="UPDATE" resource-description="SPRINT"/>
</and>
</condition>
@@ -205,7 +205,7 @@ under the License.
<menu-item name="CopyMemberLastSprint" title="${uiLabelMap.ScrumCopymenber}">
<condition>
<and>
- <if-compare operator="equals" field="sprint.currentStatusId" value="SPRINT_ACTIVE"/>
+ <if-compare field="sprint.currentStatusId" operator="equals" value="SPRINT_ACTIVE"/>
<if-compare-field operator="less" field="nowTimestamp" to-field="sprint.actualCompletionDate" type="Timestamp"/>
<if-compare field="primeSprintId" operator="not-equals" value="${sprint.workEffortId}"/>
<if-service-permission service-name="scrumPermissionCheck" main-action="UPDATE" resource-description="SPRINT"/>