You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/01/15 03:47:18 UTC
svn commit: r611997 - in /ofbiz/trunk/specialpurpose/projectmgr: config/
widget/ widget/forms/
Author: hansbak
Date: Mon Jan 14 18:47:08 2008
New Revision: 611997
URL: http://svn.apache.org/viewvc?rev=611997&view=rev
Log:
fix the paging on all projectmgr screens
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Mon Jan 14 18:47:08 2008
@@ -158,4 +158,5 @@
ProjectMgrProjectAndPhaseName=Project and Phase Name
ProjectMgrCustRequestWorkEffort=CustRequest WorkEffort
ProjectMgrViewPermissionError=You need at least PROJECTMGR_READ permission to view this screen.
-ProjectMgrCreateByExistingTask=Link to an existing Task
\ No newline at end of file
+ProjectMgrCreateByExistingTask=Link to an existing Task
+ProjectMgrRequestWorkEffortList=Cust Request WorkEffort List
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Jan 14 18:47:08 2008
@@ -28,6 +28,8 @@
<set field="labelTitleProperty" value="ProjectMgrProjectName"/>
<set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjects.bsh"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -60,6 +62,8 @@
<order-by field-name="lastName"/>
<order-by field-name="groupName"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonResourceDecorator" location="${parameters.mainDecoratorLocation}">
@@ -99,6 +103,8 @@
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindProject"/>
<set field="workEffortId" from-field="parameters.projectId"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjects.bsh"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -158,6 +164,8 @@
<set field="tabButtonItem" value="billing"/>
<set field="labelTitleProperty" value="PageTitleProjectBilling"/>
<set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -263,6 +271,8 @@
<order-by field-name="phaseName"/>
<order-by field-name="workEffortName"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -365,6 +375,8 @@
<field-map field-name="projectId" env-name="projectId"/>
</service>
<set field="phases" from-field="result.phaseList"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -400,6 +412,8 @@
<set field="workEffortId" from-field="parameters.projectId" default-value="parameters.workEffortId"/>
<set field="projectId" from-field="workEffortId"/>
<entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -431,6 +445,8 @@
<entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandardList">
<field-map field-name="workEffortId"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -485,6 +501,8 @@
<set field="tabButtonItem" value="tasks"/>
<set field="labelTitleProperty" value="PageTitleEditSkill"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -515,6 +533,8 @@
<set field="labelTitleProperty" value="PageTitleListProjectNotes"/>
<set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<set field="parameters.projectId" from-field="workEffortId"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -600,6 +620,8 @@
<actions>
<set field="parameters.projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/FindProject.bsh"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
<container style="screenlet">
@@ -620,6 +642,8 @@
<field-map field-name="projectId" env-name="projectId"/>
</service>
<set field="phases" from-field="result.phaseList"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<container style="screenlet">
@@ -640,6 +664,8 @@
<field-map field-name="projectId" env-name="projectId"/>
</service>
<set field="tasks" from-field="result.taskList"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<container style="screenlet">
@@ -660,6 +686,8 @@
<field-map field-name="projectId" env-name="projectId"/>
</service>
<set field="parties" from-field="result.projectParties"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<container style="screenlet">
@@ -742,6 +770,8 @@
<field-map field-name="partyId" env-name="parameters.partyId"/>
<order-by field-name="workEffortId"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}">
@@ -774,6 +804,8 @@
<field-map field-name="partyId" env-name="parameters.partyId"/>
<order-by field-name="workEffortId"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Mon Jan 14 18:47:08 2008
@@ -27,12 +27,9 @@
<set field="tabButtonItem" value="requestlist"/>
<set field="headerItem" value="request"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="3"/>
<set field="custRequestId" from-field="parameters.custRequestId"/>
- <entity-and entity-name="CustRequest" list-name="requests">
- <field-map field-name="statusId" value="CRQ_SUBMITTED"/>
- </entity-and>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -43,7 +40,22 @@
<container style="screenlet-body">
<link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
</container>
- <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ <container style="screenlet-body">
+ <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.OrderRequestList}"/></container>
+ <container style="screenlet">
+ <container style="screenlet-body">
+ <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.ProjectMgrRequestWorkEffortList}"/></container>
+ <container style="screenlet">
+ <container style="screenlet-body">
+ <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ </container>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -82,6 +94,8 @@
<set field="custRequestId" from-field="parameters.custRequestId"/>
<entity-one entity-name="CustRequest" value-name="custRequest"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Mon Jan 14 18:47:08 2008
@@ -31,6 +31,8 @@
<field-map field-name="taskId" env-name="parameters.workEffortId"/>
</service>
<set field="projectId" from-field="result.projectId"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -107,6 +109,8 @@
<field-map field-name="workEffortId" value="dummy"/>
</entity-one>
<set field="myTask" value="notNull"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -179,6 +183,8 @@
<set field="titleProperty" value="PageTitleFindTask"/>
<set field="headerItem" value="task"/>
<set field="labelTitleProperty" value="ProjectMgrListTasks"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -288,6 +294,8 @@
<entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandards">
<field-map field-name="workEffortId" env-name="workEffortId"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -371,6 +379,8 @@
<field-map field-name="taskId" env-name="parameters.workEffortId"/>
</service>
<set field="projectId" from-field="result.projectId"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -401,6 +411,8 @@
<set field="labelTitleProperty" value="PageTitleListTaskNotes"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -513,6 +525,8 @@
<field-map field-name="workEffortId" env-name="workEffortId"/>
</service>
<set field="taskParties" from-field="result.taskParties"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<container style="screenlet">
@@ -531,6 +545,8 @@
<actions>
<set field="tabButtonItem" value="taskView"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<container style="screenlet">
@@ -549,6 +565,8 @@
<field-map field-name="workEffortIdTo" env-name="parameters.workEffortId"/>
<field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<container style="screenlet">
@@ -567,6 +585,8 @@
<field-map field-name="workEffortIdFrom" env-name="parameters.workEffortId"/>
<field-map field-name="workEffortAssocTypeId" value="WORK_EFF_DEPENDENCY"/>
</entity-and>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<container style="screenlet">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Mon Jan 14 18:47:08 2008
@@ -26,6 +26,8 @@
<set field="titleProperty" value="PageTitleFindTimeSheet"/>
<set field="headerItem" value="timesheet"/>
<set field="labelTitleProperty" value="ProjectMgrFindTimeSheet"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -59,6 +61,8 @@
<set field="tabButtonItem" value="editTimesheet"/>
<set field="labelTitleProperty" value="ProjectMgrTimeSheetMyTime"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -155,6 +159,8 @@
<set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
<set field="my" value="My"/><!-- change link and target -->
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">
@@ -196,6 +202,8 @@
<set field="timesheetId" from-field="parameters.timesheetId"/>
<entity-one entity-name="Timesheet" value-name="timesheet"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
</actions>
<widgets>
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Jan 14 18:47:08 2008
@@ -194,7 +194,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
- <form name="EditProjectTasks" target="updateProjectTaskOrPhase" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask">
+ <form name="EditProjectTasks" target="updateProjectTaskOrPhase" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="EditProjectTasks">
<row-actions>
<service service-name="getProjectTask" result-map-name="result">
<field-map field-name="taskId" env-name="workEffortId"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Mon Jan 14 18:47:08 2008
@@ -21,15 +21,14 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="ListRequests" type="list" use-row-submit="true" title="" list-name="requests">
- <row-actions>
- <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
- </row-actions>
+ <actions>
+ <entity-and entity-name="CustRequest" list-name="requests">
+ <field-map field-name="statusId" value="CRQ_SUBMITTED"/>
+ </entity-and>
+ </actions>
<field name="custRequestName" widget-style="buttontext">
<hyperlink description="${custRequestName}[${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/>
</field>
- <field name="workEffortId">
- <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortId}"/>
- </field>
<field name="priority"><display/></field>
<field name="createdDate"><display type="date"/></field>
<field name="fromPartyId"><display/></field>
@@ -144,6 +143,29 @@
<hyperlink description="${partyId}" target-type="inter-app" target="/partymgr/control/viewprofile?partyId=${partyId}"/>
</field>
<field name="RequestTaker"><display description="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName}"/></field>
+ </form>
+ <form name="ListRequestsWorkEffortForm" type="list" use-row-submit="true" list-name="requests" paginate-target="requestlist">
+ <actions>
+ <entity-and entity-name="CustRequest" list-name="requests">
+ <field-map field-name="statusId" value="CRQ_ACCEPTED"/>
+ </entity-and>
+ </actions>
+ <row-actions>
+ <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
+ </row-actions>
+ <field name="custRequestName" widget-style="buttontext">
+ <hyperlink description="${custRequestName}[${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/>
+ </field>
+ <field name="workEffortId">
+ <hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortId}"/>
+ </field>
+ <field name="priority"><display/></field>
+ <field name="createdDate"><display type="date"/></field>
+ <field name="fromPartyId"><display/></field>
+ <field name="statusId">
+ <display-entity also-hidden="false" entity-name="StatusItem"/>
+ </field>
+ <field name="description"><display/></field>
</form>
</forms>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Jan 14 18:47:08 2008
@@ -401,7 +401,7 @@
<field name="actualHours"><display/></field>
<field name="createdDate"><display type="date"/></field>
</form>
- <form name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns">
+ <form name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" type="list" paginate-target="EditTaskPartyAssigns">
<actions>
<entity-condition entity-name="WorkEffortPartyAssignment">
<condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
@@ -446,7 +446,7 @@
<field name="custRequestTypeDescription"><display/></field>
<field name="statusItemDescription"><display/></field>
</form>
- <form name="TaskBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies">
+ <form name="TaskBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="taskView">
<row-actions>
<service service-name="getProjectTask" result-map-name="result">
<field-map field-name="taskId" env-name="workEffortIdFrom"/>
@@ -468,7 +468,7 @@
<field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
<field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
</form>
- <form name="TaskAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies">
+ <form name="TaskAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="taskView">
<row-actions>
<service service-name="getProjectTask" result-map-name="result">
<field-map field-name="taskId" env-name="workEffortIdTo"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=611997&r1=611996&r2=611997&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Mon Jan 14 18:47:08 2008
@@ -55,7 +55,7 @@
<field name="_rowSubmit"><hidden value="Y"/></field>
</form>
- <form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="FindTimeSheet">
+ <form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="MyTimesheet">
<field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet?timesheetId=${timesheetId}"/>
</field>