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/07 11:45:12 UTC
svn commit: r609563 - in /ofbiz/trunk/specialpurpose/projectmgr:
config/ProjectMgrUiLabels.properties webapp/projectmgr/RequestTabBar.ftl
widget/CommonScreens.xml widget/Menus.xml widget/RequestScreens.xml
widget/forms/RequestForms.xml
Author: hansbak
Date: Mon Jan 7 02:45:10 2008
New Revision: 609563
URL: http://svn.apache.org/viewvc?rev=609563&view=rev
Log:
refactoring of request option in projectmanager
Removed:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/RequestTabBar.ftl
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=609563&r1=609562&r2=609563&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Mon Jan 7 02:45:10 2008
@@ -74,6 +74,7 @@
ProjectMgrCompanySubtitle=Project
ProjectMgrCopyProject=Copy Project
ProjectMgrDependencies=Dependencies
+ProjectMgrEdit=Edit
ProjectMgrEditPatySkill=Edit PartySkill
ProjectMgrEditPoject=Edit Project
ProjectMgrEditTask=Edit Task
@@ -124,6 +125,7 @@
ProjectMgrTasks=Tasks
ProjectMgrTreeDetails=TreeDetails
ProjectMgrParties=Parties
+ProjectMgrView=View
ProjectMgrWorkEffortAssocTypeId=Association Type
ProjectMgrWorkEffortTypeId=Type
ProjectMgrWorkEffortPurposeTypeId=Purpose Type
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=609563&r1=609562&r2=609563&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Mon Jan 7 02:45:10 2008
@@ -397,5 +397,26 @@
</widgets>
</section>
</screen>
-
+ <screen name="CommonRequestDecorator">
+ <section>
+ <actions>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <include-menu location="component://projectmgr/widget/Menus.xml" name="RequestTabBar"/>
+ <container>
+ <label style="head1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label>
+ </container>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=609563&r1=609562&r2=609563&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Mon Jan 7 02:45:10 2008
@@ -336,4 +336,12 @@
<link target="listResourcesTask?partyId=${partyId}"></link>
</menu-item>
</menu>
+ <menu name="RequestTabBar">
+ <menu-item name="viewRequest" title="${uiLabelMap.ProjectMgrView}">
+ <link target="ViewRequest?custRequestId?${parameters.custRequestId}"/>
+ </menu-item>
+ <menu-item name="editRequest" title="${uiLabelMap.ProjectMgrEdit}">
+ <link target="EditRequest?custRequestId?${parameters.custRequestId}"/>
+ </menu-item>
+ </menu>
</menus>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=609563&r1=609562&r2=609563&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Mon Jan 7 02:45:10 2008
@@ -53,7 +53,7 @@
<section>
<actions>
<set field="titleProperty" value="OrderRequest"/>
- <set field="tabButtonItem" value="request"/>
+ <set field="tabButtonItem" value="editRequest"/>
<set field="headerItem" value="request"/>
<set field="custRequestId" from-field="parameters.custRequestId"/>
@@ -63,7 +63,7 @@
<entity-one entity-name="StatusItem" value-name="currentStatus"/>
</actions>
<widgets>
- <decorator-screen name="CommonRequestDecorator">
+ <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditCustRequest" location="component://projectmgr/widget/forms/RequestForms.xml"/>
</decorator-section>
@@ -71,118 +71,38 @@
</widgets>
</section>
</screen>
- <screen name="CommonRequestDecorator">
- <section>
- <actions>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://projectmgr/webapp/projectmgr/RequestTabBar.ftl"/></html>
- </platform-specific>
- <container>
- <label style="head1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label>
- </container>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="ViewRequest">
<section>
<actions>
<set field="MainColumnStyle" value="rightonly"/>
- <set field="tabButtonItem" value="ViewRequest"/>
+ <set field="tabButtonItem" value="viewRequest"/>
<set field="headerItem" value="request"/>
<set field="titleProperty" value="PageTitleViewRequest"/>
<set field="showRequestManagementLinks" value="Y"/>
<set field="custRequestId" from-field="parameters.custRequestId"/>
<entity-one entity-name="CustRequest" value-name="custRequest"/>
- <get-related-one value-name="custRequest" relation-name="CustRequestType" to-value-name="custRequestType"/>
- <get-related-one value-name="custRequest" relation-name="StatusItem" to-value-name="statusItem"/>
- <get-related-one value-name="custRequest" relation-name="Uom" to-value-name="currency"/>
- <get-related value-name="custRequest" relation-name="CustRequestWorkEffort" list-name="requestInfo"/>
- <set field="orderBy[]" value="sequenceNum"/>
- <get-related value-name="custRequest" relation-name="CustRequestRole" list-name="requestRoles"/>
- <get-related value-name="custRequest" relation-name="CustRequestItem" list-name="requestItems" order-by-list-name="orderBy"/>
</actions>
<widgets>
- <decorator-screen name="CommonRequestDecorator">
+ <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-screen name="ViewRequestTemplate"/>
+ <container style="lefthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead" text="${custRequest.custRequestName} [${custRequestId}] ${uiLabelMap.CommonInformation}"/></container>
+ <container style="screenlet-body">
+ <include-form name="RequestInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container style="righthalf">
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.OrderRequestRoles}"/></container>
+ <container style="screenlet-body">
+ <include-form name="RequestRolesInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+ </container>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="ViewRequestTemplate">
- <section>
- <condition>
- <not><if-empty field-name="custRequest"/></not>
- </condition>
- <widgets>
- <include-screen name="ViewRequestInfo"/>
- </widgets>
- <fail-widgets>
- <label style="head3">${uiLabelMap.OrderErrorRequestNotFound}</label>
- </fail-widgets>
- </section>
- </screen>
- <screen name="ViewRequestInfo">
- <section>
- <widgets>
- <container style="lefthalf">
- <include-screen name="requestInfo"/>
- </container>
- <container style="righthalf">
- <include-screen name="requestDate"/>
- <include-screen name="requestRoles"/>
- </container>
- </widgets>
- </section>
- </screen>
- <screen name="requestInfo">
- <section>
- <actions>
- <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
- </actions>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead" text="${custRequest.custRequestName} [${custRequestId}] ${uiLabelMap.CommonInformation}"/></container>
- <container style="screenlet-body">
- <include-form name="RequestInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>
- </container>
- </container>
- </widgets>
- </section>
- </screen>
- <screen name="requestDate">
- <section>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.CommonDate}"/></container>
- <container style="screenlet-body">
- <include-form name="RequestDateInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>
- </container>
- </container>
- </widgets>
- </section>
- </screen>
- <screen name="requestRoles">
- <section>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead" text="${uiLabelMap.OrderRequestRoles}"/></container>
- <container style="screenlet-body">
- <include-form name="RequestRolesInfo" location="component://projectmgr/widget/forms/RequestForms.xml"/>
- </container>
- </container>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=609563&r1=609562&r2=609563&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Mon Jan 7 02:45:10 2008
@@ -25,7 +25,7 @@
<script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh"/>
</row-actions>
<field name="custRequestName" widget-style="buttontext">
- <hyperlink description="${custRequestName}[${custRequestId}]" target-type="inter-app" target="/projectmgr/control/ViewRequest?custRequestId=${custRequestId}"/>
+ <hyperlink description="${custRequestName}[${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/>
</field>
<field name="workEffortId">
<hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortId}"/>
@@ -38,7 +38,7 @@
</field>
<field name="description"><display/></field>
<field name="createTaskFromRequest" widget-style="buttontext">
- <hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target-type="inter-app" target="CreateTaskbyRequest?custRequestId=${custRequestId}"/>
+ <hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target="CreateTaskbyRequest?custRequestId=${custRequestId}"/>
</field>
</form>
<form name="EditCustRequest" type="single" target="updaterequest" title="Request" default-map-name="custRequest"
@@ -102,7 +102,7 @@
<field name="lastModifiedByUserLogin"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="RequestInfo" type="single" use-row-submit="true">
+ <form name="RequestInfo" type="single" use-row-submit="true" default-entity-name="CustRequest" default-map-name="custRequest">
<actions>
<entity-one entity-name="CustRequestWorkEffort" value-name="custRequestWorkEffort">
<field-map field-name="workEffortId" env-name="workEffortId"/>
@@ -118,11 +118,11 @@
<set field="phaseId" from-field="result.phaseId"/>
<set field="phaseName" from-field="result.phaseName"/>
</actions>
- <field name="custRequestType"><display description="${custRequest.custRequestTypeId}"/></field>
- <field name="statusItem"><display description="${custRequest.statusId}"/></field>
- <field name="fromPartyId"><display description="${custRequest.fromPartyId}"/></field>
- <field name="custRequestName"><display description="${custRequest.custRequestName}"/></field>
- <field name="description"><display description="${custRequest.description}"/></field>
+ <field name="custRequestTypeId"><display-entity entity-name="CustRequestType" description="${description}"></display-entity></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
+ <field name="fromPartyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId"></display-entity></field>
+ <field name="custRequestName"><display/></field>
+ <field name="description"><display/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
<hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
</field>
@@ -130,11 +130,9 @@
<field name="taskName">
<hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffort.workEffortName}"/>
</field>
- </form>
- <form name="RequestDateInfo" type="single">
- <field name="RequestDate"><display description="${custRequest.custRequestDate}"/></field>
- <field name="createdDate"><display description="${custRequest.createdDate}"/></field>
- <field name="lastModifiedDate"><display description="${custRequest.lastModifiedDate}"/></field>
+ <field name="RequestDate"><display type="date"/></field>
+ <field name="createdDate"><display type="date"/></field>
+ <field name="lastModifiedDate"><display type="date"/></field>
</form>
<form name="RequestRolesInfo" type="list">
<actions>