[OFBiz] SVN: r5947 - in trunk:
applications/marketing/webapp/marketing/WEB-INF
applications/marketing/webapp/marketing/contact
applications/marketing/widget applications/order/servicedef
applications/order/webapp/ordermgr/WEB-INF
applications/order/webapp/ordermgr/requirement
applications/party/webapp/partymgr/WEB-INF
applications/party/webapp/partymgr/communication
applications/party/webapp/partymgr/lookup
applications/party/widget/partymgr applications/workeffort/config
applications/workeffort/entitydef
applications/workeffort/webapp/workeffort/WEB-INF
applications/workeffort/webapp/workeffort/calendar
applications/workeffort/widget framework/common/config
specialized/opentravelsystem/config
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Wed Oct 12 04:56:17 EDT 2005
Author: jonesde
Date: 2005-10-12 03:55:49 -0500 (Wed, 12 Oct 2005)
New Revision: 5947
Removed:
trunk/applications/workeffort/widget/WorkEffortQuoteScreens.xml
trunk/applications/workeffort/widget/WorkEffortRequestScreens.xml
Modified:
trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
trunk/applications/marketing/widget/ContactListScreens.xml
trunk/applications/order/servicedef/services_requirement.xml
trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
trunk/applications/party/webapp/partymgr/communication/CommForms.xml
trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
trunk/applications/party/widget/partymgr/LookupScreens.xml
trunk/applications/workeffort/config/WorkEffortUiLabels.properties
trunk/applications/workeffort/entitydef/entitymodel.xml
trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
trunk/applications/workeffort/widget/CommonScreens.xml
trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
trunk/applications/workeffort/widget/WorkEffortMenus.xml
trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml
trunk/applications/workeffort/widget/WorkEffortRequestForms.xml
trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
trunk/applications/workeffort/widget/WorkEffortScreens.xml
trunk/applications/workeffort/widget/WorkEffortShopListForms.xml
trunk/framework/common/config/CommonUiLabels.properties
trunk/specialized/opentravelsystem/config/CommonUiLabels.properties
Log:
Various additional WorkEffort related cleanups and usability enhancements, especially in the Request and Quote pages but also in the various others as well; other misc cleanups in other places and moved LookupCommEvent screen and related forms from marketing to party component where it makes much more sense
Modified: trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -469,12 +469,12 @@
<view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/>
<view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>
- <view-map name="LookupCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupCommEvent"/>
<view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
<view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/>
<view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
<view-map name="LookupPartyClassificationGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyClassificationGroup"/>
+ <view-map name="LookupCommEvent" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCommEvent"/>
<view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/>
<!-- end of view mappings -->
</site-conf>
Modified: trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -311,13 +311,15 @@
</entity-options>
</drop-down>
</field>
+
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListLookupContactList" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="" title="" type="list">
<actions>
<service result-map-list-iterator-name="listIt" result-map-name="result" service-name="performFind">
<field-map env-name="parameters" field-name="inputFields"/>
- <field-map env-name="entityName" field-name="entityName"/>
+ <field-map env-name="entityName" value="ContactList"/>
</service>
</actions>
<field name="contactListId" title="${uiLabelMap.ContactListContactListId}" widget-style="buttontext">
@@ -329,57 +331,6 @@
<field name="marketingCampaignId"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
</form>
- <form name="LookupCommEvent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="LookupCommEvent" title="" type="single">
- <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field>
- <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="statusId">
- <drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
- <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="contactMechTypeId">
- <drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
- </drop-down>
- </field>
- <field name="roleTypeIdFrom">
- <drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
- </drop-down>
- </field>
- <field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field>
- <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-find/></field>
- <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field>
- <field map-name="subjectMap" name="subject"><text-find/></field>
- <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
- </form>
- <form name="ListLookupCommEvent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="" title="" type="list">
- <actions>
- <service result-map-list-iterator-name="listIt" result-map-name="result" service-name="performFind">
- <field-map env-name="parameters" field-name="inputFields"/>
- <field-map env-name="entityName" field-name="entityName"/>
- </service>
- </actions>
- <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
- </field>
- <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
- <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
- </field>
- <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
- <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
- </field>
- <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
- <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
- <field name="roleTypeIdFrom"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="roleTypeIdTo"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="custReqestId" position="1"><text size="20"/></field>
- <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
- <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
- </form>
<form name="ListPreferredContactMech" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="tabletext"
target="" title="" type="list">
Modified: trunk/applications/marketing/widget/ContactListScreens.xml
===================================================================
--- trunk/applications/marketing/widget/ContactListScreens.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/marketing/widget/ContactListScreens.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -268,26 +268,6 @@
</section>
</screen>
- <screen name="LookupCommEvent">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleLookupCommEvent"/>
- <set field="tabButtonItem" value="ContactList"/>
- <set field="labelTitleProperty" value="PageTitleLookupCommEvent"/>
- <set field="title" value="${uiLabelMap.PageTitleLookupCommEvent}" />
- <set field="entityName" value="CommunicationEvent"/>
- </actions>
- <widgets>
- <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="body">
- <container><label style="head1">${uiLabelMap.PageTitleLookupContactList}</label></container>
- <include-form name="LookupCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
- <include-form name="ListLookupCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="LookupContactList">
<section>
<actions>
@@ -295,7 +275,6 @@
<set field="tabButtonItem" value="ContactList"/>
<set field="labelTitleProperty" value="PageTitleLookupContactList"/>
<set field="title" value="${uiLabelMap.PageTitleLookupContactList}" />
- <set field="entityName" value="ContactList"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
Modified: trunk/applications/order/servicedef/services_requirement.xml
===================================================================
--- trunk/applications/order/servicedef/services_requirement.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/order/servicedef/services_requirement.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -30,7 +30,12 @@
<!-- Requirement Services -->
<service name="requirementInterface" engine="interface" location="" invoke="">
<description>Requirement Interface</description>
- <auto-attributes mode="IN" entity-name="Requirement" include="nonpk" optional="true"/>
+ <auto-attributes mode="IN" entity-name="Requirement" include="nonpk" optional="true">
+ <exclude field-name="createdDate"/>
+ <exclude field-name="createdByUserLogin"/>
+ <exclude field-name="lastModifiedDate"/>
+ <exclude field-name="lastModifiedByUserLogin"/>
+ </auto-attributes>
</service>
<service name="createRequirement" engine="simple"
location="org/ofbiz/order/requirement/RequirementServices.xml" invoke="createRequirement">
Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -1187,6 +1187,11 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupVariantProduct"/>
</request-map>
+
+ <request-map uri="LookupShoppingList">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupShoppingList"/>
+ </request-map>
<request-map uri="LookupCustRequest">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupCustRequest"/>
@@ -1195,6 +1200,10 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupCustRequestItem"/>
</request-map>
+ <request-map uri="LookupRequirement">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupRequirement"/>
+ </request-map>
<request-map uri="LookupQuote">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupQuote"/>
@@ -1203,14 +1212,6 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupQuoteItem"/>
</request-map>
- <request-map uri="LookupRequirement">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupRequirement"/>
- </request-map>
- <request-map uri="LookupShoppingList">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupShoppingList"/>
- </request-map>
<request-map uri="LookupOrderHeader">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupOrderHeader"/>
@@ -1332,12 +1333,13 @@
<view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
<view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
<view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/>
+
+ <view-map name="LookupShoppingList" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupShoppingList"/>
<view-map name="LookupCustRequest" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupCustRequest"/>
<view-map name="LookupCustRequestItem" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupCustRequestItem"/>
+ <view-map name="LookupRequirement" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupRequirement"/>
<view-map name="LookupQuote" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuote"/>
<view-map name="LookupQuoteItem" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuoteItem"/>
- <view-map name="LookupRequirement" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupRequirement"/>
- <view-map name="LookupShoppingList" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupShoppingList"/>
<view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/>
<!-- PDFs -->
Modified: trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -85,7 +85,7 @@
target="updateRequirement" title="" default-map-name="requirement"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<alt-target use-when="requirement==null" target="createRequirement"/>
- <auto-fields-entity entity-name="Requirement" default-field-type="edit"/>
+ <auto-fields-service service-name="updateRequirement" default-field-type="edit"/>
<field name="requirementId"><hidden/></field>
<field name="requirementTypeId">
<drop-down allow-empty="false">
@@ -100,9 +100,9 @@
</entity-options>
</drop-down>
</field>
- <field name="productId" title="${uiLabelMap.ProductProductId}">
- <lookup target-form-name="LookupProduct"/>
- </field>
+ <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
+ <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
+ <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
<field name="custRequestId" map-name="parameters"><text/></field>
<field name="custRequestItemSeqId" map-name="parameters"><text/></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit">
@@ -121,5 +121,4 @@
<hyperlink description="${custRequestItemSeqId}" target="requestitem?custRequestId=${custRequestId}&custRequestItemSeqId=${custRequestItemSeqId}"/>
</field>
</form>
-
</forms>
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -765,36 +765,6 @@
<response name="error" type="view" value="ListPartyContactLists"/>
</request-map>
- <!-- Lookup request mappings -->
- <request-map uri="LookupPartyName">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPartyName"/>
- </request-map>
- <request-map uri="LookupPerson">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPerson"/>
- </request-map>
- <request-map uri="LookupPartyAndUserLoginAndPerson">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPartyAndUserLoginAndPerson"/>
- </request-map>
- <request-map uri="LookupPartyGroup">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPartyGroup"/>
- </request-map>
- <request-map uri="LookupCustRequest">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupCustRequest"/>
- </request-map>
- <request-map uri="LookupSegmentGroup">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupSegmentGroup"/>
- </request-map>
- <request-map uri="LookupContactList">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupContactList"/>
- </request-map>
-
<request-map uri="ViewSegmentRoles">
<security https="true" auth="true"/>
<response name="success" type="view" value="ViewSegmentRoles"/>
@@ -912,6 +882,39 @@
<response name="error" type="view" value="ListCommWorkEfforts"/>
</request-map>
+ <!-- Lookup request mappings -->
+ <request-map uri="LookupPartyName">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupPartyName"/>
+ </request-map>
+ <request-map uri="LookupPerson">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupPerson"/>
+ </request-map>
+ <request-map uri="LookupPartyAndUserLoginAndPerson">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupPartyAndUserLoginAndPerson"/>
+ </request-map>
+ <request-map uri="LookupPartyGroup">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupPartyGroup"/>
+ </request-map>
+ <request-map uri="LookupCommEvent">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupCommEvent"/>
+ </request-map>
+ <request-map uri="LookupCustRequest">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupCustRequest"/>
+ </request-map>
+ <request-map uri="LookupSegmentGroup">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupSegmentGroup"/>
+ </request-map>
+ <request-map uri="LookupContactList">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupContactList"/>
+ </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -982,6 +985,8 @@
<view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
<view-map name="LookupPartyAndUserLoginAndPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson"/>
<view-map name="LookupPartyGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
+ <view-map name="LookupCommEvent" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCommEvent"/>
+
<view-map name="LookupCustRequest" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupCustRequest"/>
<view-map name="LookupContactList" type="screen" page="component://party/widget/partymgr/PartyContactListScreens.xml#ListLookupContactList"/>
Modified: trunk/applications/party/webapp/partymgr/communication/CommForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/communication/CommForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/party/webapp/partymgr/communication/CommForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -301,14 +301,14 @@
default-widget-style="inputBox"
extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml"
target="createCommEventWorkEffort" title="" type="single">
+ <field name="communicationEventId"><display/></field>
+ <field name="workEffortId" use-when="workEffort==null&&workEffortId==null" ><lookup target-form-name="/workeffort/control/LookupWorkEffort"/></field>
+ <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"> <submit button-type="text-link"/> </field>
<sort-order>
<sort-field name="communicationEventId"/>
<banner left-text-style="tabletext" left-text="Enter existing WorkEffort Id below"/>
<sort-field name="workEffortId"/>
<banner left-text-style="tabletext" left-text="OR add new WorkEffort data below to create new entity (leave WorkEffort Id empty)"/>
</sort-order>
- <field name="communicationEventId" > <display/> </field>
- <field name="workEffortId" use-when="workEffort==null&&workEffortId==null" ><lookup target-form-name="/workeffort/control/LookupWorkEffort"/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"> <submit button-type="text-link"/> </field>
</form>
</forms>
Modified: trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -181,4 +181,58 @@
<field name="parentGroupId"><display/></field>
<field name="description"><display/></field>
</form>
+
+ <form name="LookupCommEvent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="LookupCommEvent" title="" type="single">
+ <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field>
+ <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="statusId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="contactMechTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+ </drop-down>
+ </field>
+ <field name="roleTypeIdFrom">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+ </drop-down>
+ </field>
+ <field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field>
+ <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-find/></field>
+ <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field>
+ <field map-name="subjectMap" name="subject"><text-find/></field>
+
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
+ </form>
+ <form name="ListLookupCommEvent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="" title="" type="list">
+ <actions>
+ <service service-name="performFind" result-map-list-iterator-name="listIt" result-map-name="result">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="CommunicationEvent"/>
+ </service>
+ </actions>
+ <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
+ </field>
+ <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
+ <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
+ </field>
+ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
+ <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
+ </field>
+ <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
+ <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+ <field name="roleTypeIdFrom"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="roleTypeIdTo"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+ <field name="custReqestId" position="1"><text size="20"/></field>
+ <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
+ <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
+ </form>
</forms>
Modified: trunk/applications/party/widget/partymgr/LookupScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/LookupScreens.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/party/widget/partymgr/LookupScreens.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -154,4 +154,24 @@
</widgets>
</section>
</screen>
+
+ <screen name="LookupCommEvent">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleLookupCommEvent"/>
+ <set field="tabButtonItem" value="ContactList"/>
+ <set field="labelTitleProperty" value="PageTitleLookupCommEvent"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupCommEvent}" />
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <container><label style="head1">${uiLabelMap.PageTitleLookupCommEvent}</label></container>
+ <include-form name="LookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ <include-form name="ListLookupCommEvent" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: trunk/applications/workeffort/config/WorkEffortUiLabels.properties
===================================================================
--- trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/config/WorkEffortUiLabels.properties 2005-10-12 08:55:49 UTC (rev 5947)
@@ -9,31 +9,37 @@
PageTitleAddWorkEffort=Add Work Effort
PageTitleEditWorkEffort=Edit Work Effort
PageTitleFindWorkEffort=Find Work Effort
-PageTitleListWorkEfforts=List Work Efforts
+PageTitleListWorkEfforts=Work Efforts
PageTitleTreeWorkEfforts=Child Work Efforts
-PageTitleAddWorkEffortCommEvent=Add Work Effort CommEvent
+PageTitleAddWorkEffortCommEvent=Add Work Effort Communication Event
PageTitleEditWorkEffortCommEvent=Edit Work Effort CommEvent
-PageTitleListWorkEffortCommEvents=List Work Effort CommEvents
-PageTitleAddWorkEffortPartyAssign=Add Work Effort PartyAssign
-PageTitleEditWorkEffortPartyAssign=Edit Work Effort PartyAssign
-PageTitleListWorkEffortPartyAssigns=List Work Effort PartyAssigns
+PageTitleListWorkEffortCommEvents=Work Effort Communication Events
+PageTitleAddWorkEffortPartyAssign=Add Work Effort Party Assignment
+PageTitleEditWorkEffortPartyAssign=Edit Work Effort Party Assignment
+PageTitleListWorkEffortPartyAssigns=Work Effort Party Assignments
PageTitleAddWorkEffortQuote=Add Work Effort Quote
PageTitleEditWorkEffortQuote=Edit Work Effort Quote
-PageTitleListWorkEffortQuotes=List Work Effort Quotes
+PageTitleListWorkEffortQuotes=Work Effort Quotes
PageTitleAddWorkEffortQuoteItem=Add Work Effort QuoteItem
PageTitleEditWorkEffortQuoteItem=Edit Work Effort QuoteItem
-PageTitleListWorkEffortQuoteItems=List Work Effort QuoteItems
+PageTitleListWorkEffortQuoteItems=Work Effort QuoteItems
PageTitleAddWorkEffortRequest=Add Work Effort Request
PageTitleEditWorkEffortRequest=Edit Work Effort Request
-PageTitleListWorkEffortRequests=List Work Effort Requests
+PageTitleListWorkEffortRequests=Work Effort Requests
PageTitleAddWorkEffortRequestItem=Add Work Effort RequestItem
PageTitleEditWorkEffortRequestItem=Edit Work Effort RequestItem
-PageTitleListWorkEffortRequestItems=List Work Effort RequestItems
+PageTitleListWorkEffortRequestItems=Work Effort RequestItems
+
PageTitleAddWorkEffortRequirement=Add Work Effort Requirement
PageTitleEditWorkEffortRequirement=Edit Work Effort Requirement
-PageTitleListWorkEffortRequirements=List Work Effort Requirement
+PageTitleListWorkEffortRequirements=Work Effort Requirements
+
PageTitleWorkEffortRelatedSummary=Work Effort Related Summary
+
+PageTitleListWorkEffortShopLists=Work Effort Shopping Lists
+PageTitleAddWorkEffortShopList=Add Work Effort Shopping List
PageTitleWorkEffortShopLists=Work Effort Shopping Lists
+
PageTitleListWorkEffortOrderHeaders=Work Effort Orders
PageTitleAddWorkEffortOrderHeader=Add Order to Work Effort
@@ -195,7 +201,8 @@
WorkEffortRevision=Revision
WorkEffortSelected=Selected
WorkEffortSelectContactMechanism=Select an existing contact mechanism
-WorkEffortShopLists=Shop Lists
+WorkEffortShopLists=Shopping Lists
+WorkEffortShopListId=Shopping List ID
WorkEffortShowActive=Show Active
WorkEffortShowAllNotes=Show All Notes
WorkEffortShowThisItemsNotes=Show This Item's Notes
Modified: trunk/applications/workeffort/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/workeffort/entitydef/entitymodel.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/entitydef/entitymodel.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -78,11 +78,9 @@
title="Time Entry Entity">
<field name="timeEntryId" type="id-ne"></field>
<field name="partyId" type="id"></field>
- <field name="roleTypeId" type="id"></field>
- <field name="fromDatetime" type="date-time"></field>
- <field name="thruDatetime" type="date-time"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
<field name="rateTypeId" type="id"></field>
- <field name="uomId" type="id"></field>
<field name="workEffortId" type="id"></field>
<field name="timesheetId" type="id"></field>
<field name="hours" type="floating-point"></field>
@@ -91,19 +89,9 @@
<relation type="one" fk-name="TIME_ENT_PRTY" rel-entity-name="Party">
<key-map field-name="partyId"/>
</relation>
- <relation type="one" fk-name="TIME_ENT_RTYP" rel-entity-name="RoleType">
- <key-map field-name="roleTypeId"/>
- </relation>
- <relation type="one-nofk" rel-entity-name="PartyRole">
- <key-map field-name="partyId"/>
- <key-map field-name="roleTypeId"/>
- </relation>
<relation type="one" fk-name="TIME_ENT_RTTP" rel-entity-name="RateType">
<key-map field-name="rateTypeId"/>
</relation>
- <relation type="one" fk-name="TIME_ENT_UOM" rel-entity-name="Uom">
- <key-map field-name="uomId"/>
- </relation>
<relation type="one" fk-name="TIME_ENT_WEFF" rel-entity-name="WorkEffort">
<key-map field-name="workEffortId"/>
</relation>
@@ -136,7 +124,6 @@
title="Timesheet Entity">
<field name="timesheetId" type="id-ne"></field>
<field name="partyId" type="id"></field>
- <field name="roleTypeId" type="id"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
<field name="comments" type="comment"></field>
@@ -144,13 +131,6 @@
<relation type="one" fk-name="TIMESHEET_PRTY" rel-entity-name="Party">
<key-map field-name="partyId"/>
</relation>
- <relation type="one" fk-name="TIMESHEET_RTYP" rel-entity-name="RoleType">
- <key-map field-name="roleTypeId"/>
- </relation>
- <relation type="one-nofk" rel-entity-name="PartyRole">
- <key-map field-name="partyId"/>
- <key-map field-name="roleTypeId"/>
- </relation>
</entity>
<entity entity-name="TimesheetRole"
package-name="org.ofbiz.workeffort.timesheet"
@@ -957,12 +937,12 @@
<field name="roleTypeId" type="id-ne"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
- <field name="facilityId" type="id"></field>
<field name="statusId" type="id"></field>
<field name="statusDateTime" type="date-time"></field>
+ <field name="expectationEnumId" type="id"></field>
+ <field name="facilityId" type="id"></field>
<field name="comments" type="comment"></field>
<field name="mustRsvp" type="indicator"></field>
- <field name="expectationEnumId" type="id"></field>
<prim-key field="workEffortId"/>
<prim-key field="partyId"/>
<prim-key field="roleTypeId"/>
@@ -1314,18 +1294,18 @@
title="WorkRequirementFulfillment And Requirement">
<description>Ties WorkRequirementFulfillment to Requirement.</description>
<member-entity entity-alias="WRF" entity-name="WorkRequirementFulfillment"/>
- <member-entity entity-alias="R" entity-name="Requirement"/>
+ <member-entity entity-alias="REQ" entity-name="Requirement"/>
<member-entity entity-alias="SI" entity-name="StatusItem"/>
<member-entity entity-alias="WRFT" entity-name="WorkReqFulfType"/>
<alias-all entity-alias="WRF"/>
- <alias-all entity-alias="R"/>
+ <alias-all entity-alias="REQ"/>
<alias name="statusItemDescription" field="description" entity-alias="SI"/>
<alias name="workReqFulfTypeDescription" field="description" entity-alias="WRFT"/>
- <alias name="requirementDescription" field="description" entity-alias="R"/>
- <view-link entity-alias="WRF" rel-entity-alias="R">
+ <alias name="requirementDescription" field="description" entity-alias="REQ"/>
+ <view-link entity-alias="WRF" rel-entity-alias="REQ">
<key-map field-name="requirementId"/>
</view-link>
- <view-link entity-alias="R" rel-entity-alias="SI" rel-optional="true">
+ <view-link entity-alias="REQ" rel-entity-alias="SI" rel-optional="true">
<key-map field-name="statusId"/>
</view-link>
<view-link entity-alias="WRF" rel-entity-alias="WRFT" rel-optional="true">
Modified: trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -239,27 +239,12 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="ListWorkEffortRequests"/>
</request-map>
- <request-map uri="AddWorkEffortRequest">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="AddWorkEffortRequest"/>
- </request-map>
- <request-map uri="EditWorkEffortRequest">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWorkEffortRequest"/>
- </request-map>
-
<request-map uri="createWorkEffortRequest">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffortRequest"/>
- <response name="success" type="view" value="EditWorkEffortRequest"/>
- <response name="error" type="view" value="AddWorkEffortRequest"/>
+ <response name="success" type="view" value="ListWorkEffortRequests"/>
+ <response name="error" type="view" value="ListWorkEffortRequests"/>
</request-map>
- <request-map uri="updateWorkEffortRequest">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateCustRequest"/>
- <response name="success" type="view" value="EditWorkEffortRequest"/>
- <response name="error" type="view" value="EditWorkEffortRequest"/>
- </request-map>
<request-map uri="deleteWorkEffortRequest">
<security https="true" auth="true"/>
<event type="service" invoke="deleteWorkEffortRequest"/>
@@ -268,36 +253,17 @@
</request-map>
<!-- WorkEffort CustRequestItem request mappings -->
- <request-map uri="ListWorkEffortRequestItems">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListWorkEffortRequestItems"/>
- </request-map>
- <request-map uri="AddWorkEffortRequestItem">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="AddWorkEffortRequestItem"/>
- </request-map>
- <request-map uri="EditWorkEffortRequestItem">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWorkEffortRequestItem"/>
- </request-map>
-
<request-map uri="createWorkEffortRequestItem">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffortRequestItemAndRequestItem"/>
- <response name="success" type="view" value="EditWorkEffortRequestItem"/>
- <response name="error" type="view" value="AddWorkEffortRequestItem"/>
+ <response name="success" type="view" value="ListWorkEffortRequests"/>
+ <response name="error" type="view" value="ListWorkEffortRequests"/>
</request-map>
- <request-map uri="updateWorkEffortRequestItem">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateCustRequestItem"/>
- <response name="success" type="view" value="EditWorkEffortRequestItem"/>
- <response name="error" type="view" value="EditWorkEffortRequestItem"/>
- </request-map>
<request-map uri="deleteWorkEffortRequestItem">
<security https="true" auth="true"/>
<event type="service" invoke="deleteWorkEffortRequestItem"/>
- <response name="success" type="view" value="ListWorkEffortRequestItems"/>
- <response name="error" type="view" value="ListWorkEffortRequestItems"/>
+ <response name="success" type="view" value="ListWorkEffortRequests"/>
+ <response name="error" type="view" value="ListWorkEffortRequests"/>
</request-map>
<!-- WorkEffort Quote request mappings -->
@@ -305,27 +271,12 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="ListWorkEffortQuotes"/>
</request-map>
- <request-map uri="AddWorkEffortQuote">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="AddWorkEffortQuote"/>
- </request-map>
- <request-map uri="EditWorkEffortQuote">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWorkEffortQuote"/>
- </request-map>
-
<request-map uri="createWorkEffortQuote">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffortQuote"/>
<response name="success" type="view" value="EditWorkEffortQuote"/>
<response name="error" type="view" value="AddWorkEffortQuote"/>
</request-map>
- <request-map uri="updateWorkEffortQuote">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateQuote"/>
- <response name="success" type="view" value="EditWorkEffortQuote"/>
- <response name="error" type="view" value="EditWorkEffortQuote"/>
- </request-map>
<request-map uri="deleteWorkEffortQuote">
<security https="true" auth="true"/>
<event type="service" invoke="deleteWorkEffortQuote"/>
@@ -334,36 +285,17 @@
</request-map>
<!-- WorkEffort QuoteItem request mappings -->
- <request-map uri="ListWorkEffortQuoteItems">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListWorkEffortQuoteItems"/>
- </request-map>
- <request-map uri="AddWorkEffortQuoteItem">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="AddWorkEffortQuoteItem"/>
- </request-map>
- <request-map uri="EditWorkEffortQuoteItem">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWorkEffortQuoteItem"/>
- </request-map>
-
<request-map uri="createWorkEffortQuoteItem">
<security https="true" auth="true"/>
<event type="service" invoke="createQuoteItem"/>
- <response name="success" type="view" value="EditWorkEffortQuoteItem"/>
- <response name="error" type="view" value="AddWorkEffortQuoteItem"/>
+ <response name="success" type="view" value="ListWorkEffortQuotes"/>
+ <response name="error" type="view" value="ListWorkEffortQuotes"/>
</request-map>
- <request-map uri="updateWorkEffortQuoteItem">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateQuoteItem"/>
- <response name="success" type="view" value="EditWorkEffortQuoteItem"/>
- <response name="error" type="view" value="EditWorkEffortQuoteItem"/>
- </request-map>
<request-map uri="deleteWorkEffortQuoteItem">
<security https="true" auth="true"/>
<event type="service" invoke="removeQuoteItem"/>
- <response name="success" type="view" value="ListWorkEffortQuoteItems"/>
- <response name="error" type="view" value="ListWorkEffortQuoteItems"/>
+ <response name="success" type="view" value="ListWorkEffortQuotes"/>
+ <response name="error" type="view" value="ListWorkEffortQuotes"/>
</request-map>
<!-- WorkEffort Requirement request mappings -->
@@ -429,6 +361,10 @@
</request-map>
<!-- Lookup request mappings -->
+ <request-map uri="LookupPartyName">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupPartyName"/>
+ </request-map>
<request-map uri="LookupPerson">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupPerson"/>
@@ -437,6 +373,11 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupPartyGroup"/>
</request-map>
+ <request-map uri="LookupCommEvent">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupCommEvent"/>
+ </request-map>
+
<request-map uri="LookupProduct">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupProduct"/>
@@ -449,10 +390,6 @@
<security auth="true" https="true"/>
<response name="success" type="view" value="LookupProductFeature"/>
</request-map>
- <request-map uri="LookupPartyName">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPartyName"/>
- </request-map>
<request-map uri="LookupWorkEffort">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupWorkEffort"/>
@@ -470,10 +407,26 @@
<security auth="true" https="true"/>
<response name="success" type="view" value="LookupShoppingList"/>
</request-map>
+ <request-map uri="LookupCustRequest">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupCustRequest"/>
+ </request-map>
+ <request-map uri="LookupCustRequestItem">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupCustRequestItem"/>
+ </request-map>
<request-map uri="LookupRequirement">
<security auth="true" https="true"/>
<response name="success" type="view" value="LookupRequirement"/>
</request-map>
+ <request-map uri="LookupQuote">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupQuote"/>
+ </request-map>
+ <request-map uri="LookupQuoteItem">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="LookupQuoteItem"/>
+ </request-map>
<request-map uri="LookupOrderHeader">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupOrderHeader"/>
@@ -509,29 +462,18 @@
<view-map name="ListWorkEffortPartyAssigns" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortPartyAssigns"/>
<view-map name="ListWorkEffortCommEvents" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortCommEvents"/>
-
- <view-map name="ListWorkEffortRequirements" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortRequirements"/>
<view-map name="ListWorkEffortShopLists" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortShopLists"/>
+
+ <view-map name="ListWorkEffortRequests" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortRequests"/>
+ <view-map name="ListWorkEffortRequirements" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortRequirements"/>
+ <view-map name="ListWorkEffortQuotes" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortQuotes"/>
<view-map name="ListWorkEffortOrderHeaders" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortOrderHeaders"/>
- <view-map name="AddWorkEffortRequest" type="screen" page="component://workeffort/widget/WorkEffortRequestScreens.xml#AddWorkEffortRequest"/>
- <view-map name="EditWorkEffortRequest" type="screen" page="component://workeffort/widget/WorkEffortRequestScreens.xml#EditWorkEffortRequest"/>
- <view-map name="ListWorkEffortRequests" type="screen" page="component://workeffort/widget/WorkEffortRequestScreens.xml#ListWorkEffortRequests"/>
- <view-map name="AddWorkEffortRequestItem" type="screen" page="component://workeffort/widget/WorkEffortRequestScreens.xml#AddWorkEffortRequestItem"/>
- <view-map name="EditWorkEffortRequestItem" type="screen" page="component://workeffort/widget/WorkEffortRequestScreens.xml#EditWorkEffortRequestItem"/>
- <view-map name="ListWorkEffortRequestItems" type="screen" page="component://workeffort/widget/WorkEffortRequestScreens.xml#ListWorkEffortRequestItems"/>
-
- <view-map name="AddWorkEffortQuote" type="screen" page="component://workeffort/widget/WorkEffortQuoteScreens.xml#AddWorkEffortQuote"/>
- <view-map name="EditWorkEffortQuote" type="screen" page="component://workeffort/widget/WorkEffortQuoteScreens.xml#EditWorkEffortQuote"/>
- <view-map name="ListWorkEffortQuotes" type="screen" page="component://workeffort/widget/WorkEffortQuoteScreens.xml#ListWorkEffortQuotes"/>
- <view-map name="AddWorkEffortQuoteItem" type="screen" page="component://workeffort/widget/WorkEffortQuoteScreens.xml#AddWorkEffortQuoteItem"/>
- <view-map name="EditWorkEffortQuoteItem" type="screen" page="component://workeffort/widget/WorkEffortQuoteScreens.xml#EditWorkEffortQuoteItem"/>
- <view-map name="ListWorkEffortQuoteItems" type="screen" page="component://workeffort/widget/WorkEffortQuoteScreens.xml#ListWorkEffortQuoteItems"/>
-
+ <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
<view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
<view-map name="LookupPartyGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
- <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
-
+ <view-map name="LookupCommEvent" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCommEvent"/>
+
<view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
<view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/>
<view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
@@ -541,7 +483,11 @@
<view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/>
<view-map name="LookupShoppingList" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupShoppingList"/>
+ <view-map name="LookupCustRequest" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupCustRequest"/>
+ <view-map name="LookupCustRequestItem" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupCustRequestItem"/>
<view-map name="LookupRequirement" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupRequirement"/>
+ <view-map name="LookupQuote" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuote"/>
+ <view-map name="LookupQuoteItem" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuoteItem"/>
<view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/>
<!-- end of view mappings -->
</site-conf>
Modified: trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl 2005-10-12 08:55:49 UTC (rev 5947)
@@ -100,7 +100,7 @@
<div class="tabletext">
<form action="<@ofbizUrl>month</@ofbizUrl>" name="partyform" method="post">
<input type="hidden" name="start" value="${start.time?string("#")}"/>
- ${uiLabelMap.WorkEffortByPartyId}: <input type="text" name="partyId" value="${requestParameters.partyId?if_exists}" class="inputbox"/>
+ ${uiLabelMap.WorkEffortByPartyId}: <input type="text" name="partyId" value="${requestParameters.partyId?if_exists}" class="inputBox"/>
<a href="javascript:call_fieldlookup2(document.partyform.partyId,'<@ofbizUrl>LookupPartyName</@ofbizUrl>');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'></a>
<input type="submit" value="${uiLabelMap.CommonView}" class="smallSubmit"/>
</form>
@@ -111,7 +111,7 @@
<form action="<@ofbizUrl>month</@ofbizUrl>" method="post">
<input type="hidden" name="start" value="${start.time?string("#")}"/>
${uiLabelMap.WorkEffortByFacility}:
- <select name="facilityId" class="selectbox">
+ <select name="facilityId" class="selectBox">
<#list allFacilities as facility>
<option value="${facility.facilityId}"<#if requestParameters.facilityId?has_content && requestParameters.facilityId == facility.facilityId>${uiLabelMap.WorkEffortSelected}</#if>>${facility.facilityName}</option>
</#list>
Modified: trunk/applications/workeffort/widget/CommonScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/CommonScreens.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/widget/CommonScreens.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -31,6 +31,7 @@
<!-- base/top/specific map first, then more common map added for shared labels -->
<property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.WorkEffortCompanyName" global="true"/>
Modified: trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -21,7 +21,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
- <form name="ListWorkEffortCommEvents" separate-columns="true" target="updateCommunicationEventWorkEff" title="" type="list"
+ <form name="ListWorkEffortCommEvents" separate-columns="false" target="updateCommunicationEventWorkEff" title="" type="list"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
<actions>
<entity-condition entity-name="WorkEffortCommunicationEventView">
@@ -31,25 +31,23 @@
<order-by field-name="communicationEventId"/>
</entity-condition>
</actions>
- <field name="workEffortId" widget-style="buttontext">
- <hyperlink description="[${workEffortId}]" target="EditWorkEffort?workEffortId=${workEffortId}"/>
- </field>
+ <field name="workEffortId"><hidden/></field>
<field name="communicationEventId" widget-style="buttontext">
<hyperlink target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="inter-app" description="${communicationEventId}"/>
</field>
<field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
- <field name="description"><textarea rows="2" cols="30"/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field name="deleteLink" title=" " widget-style="buttontext"><hyperlink target="deleteCommunicationEventWorkEff?workEffortId=${workEffortId}&communicationEventId=${communicationEventId}" also-hidden="false" description="[${uiLabelMap.CommonDelete}]" link-style="linktext"/></field>
+ <field name="description"><text size="40"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="deleteLink" title=" " widget-style="buttontext"><hyperlink target="deleteCommunicationEventWorkEff?workEffortId=${workEffortId}&communicationEventId=${communicationEventId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field>
</form>
<form name="AddWorkEffortCommEvent" default-map-name="communicationEvent" target="createWorkEffortCommEvent" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
extends="EditCommEvent" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml">
- <field name="workEffortId"><display/></field>
+ <field name="workEffortId"><hidden/></field>
<field name="description"><textarea/></field>
- <field name="communicationEventId"><lookup target-form-name="/marketing/control/LookupCommEvent"/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="communicationEventId"><lookup target-form-name="LookupCommEvent"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="buttontext"><submit button-type="text-link"/></field>
<sort-order>
<sort-field name="workEffortId"/>
<banner left-text-style="tabletext" left-text="Enter existing CommunicationEvent Id below"/>
Modified: trunk/applications/workeffort/widget/WorkEffortMenus.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortMenus.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/widget/WorkEffortMenus.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -46,40 +46,34 @@
default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
orientation="horizontal" type="simple">
<menu-item name="WorkEffort" title="${uiLabelMap.WorkEffort}">
- <link target="/EditWorkEffort?workEffortId=${workEffortId}"/>
+ <link target="EditWorkEffort?workEffortId=${workEffortId}"/>
</menu-item>
<menu-item name="WorkEffortRelatedSummary" title="${uiLabelMap.WorkEffortRelatedSummary}">
- <link target="/ListWorkEffortRelatedSummary?workEffortId=${workEffortId}"/>
+ <link target="ListWorkEffortRelatedSummary?workEffortId=${workEffortId}"/>
</menu-item>
<menu-item name="WorkEffortAssocs" title="${uiLabelMap.WorkEffortChildren}">
- <link target="/ChildWorkEfforts?workEffortId=${workEffortId}&trail=${workEffortId}"/>
+ <link target="ChildWorkEfforts?workEffortId=${workEffortId}&trail=${workEffortId}"/>
</menu-item>
<menu-item name="WorkEffortPartyAssigns" title="${uiLabelMap.WorkEffortParties}">
- <link target="/ListWorkEffortPartyAssigns?workEffortId=${workEffortId}"/>
+ <link target="ListWorkEffortPartyAssigns?workEffortId=${workEffortId}"/>
</menu-item>
<menu-item name="WorkEffortCommEvents" title="${uiLabelMap.WorkEffortCommEvents}">
- <link target="/ListWorkEffortCommEvents?workEffortId=${workEffortId}"/>
+ <link target="ListWorkEffortCommEvents?workEffortId=${workEffortId}"/>
</menu-item>
+ <menu-item name="WorkEffortShopLists" title="${uiLabelMap.WorkEffortShopLists}">
+ <link target="ListWorkEffortShopLists?workEffortId=${workEffortId}"/>
+ </menu-item>
<menu-item name="WorkEffortRequests" title="${uiLabelMap.WorkEffortRequests}">
- <link target="/ListWorkEffortRequests?workEffortId=${workEffortId}"/>
+ <link target="ListWorkEffortRequests?workEffortId=${workEffortId}"/>
</menu-item>
- <menu-item name="WorkEffortRequestItems" title="${uiLabelMap.WorkEffortRequestItems}">
- <link target="/ListWorkEffortRequestItems?workEffortId=${workEffortId}"/>
+ <menu-item name="WorkEffortRequirements" title="${uiLabelMap.WorkEffortRequirements}">
+ <link target="ListWorkEffortRequirements?workEffortId=${workEffortId}"/>
</menu-item>
<menu-item name="WorkEffortQuotes" title="${uiLabelMap.WorkEffortQuotes}">
- <link target="/ListWorkEffortQuotes?workEffortId=${workEffortId}"/>
+ <link target="ListWorkEffortQuotes?workEffortId=${workEffortId}"/>
</menu-item>
- <menu-item name="WorkEffortQuoteItems" title="${uiLabelMap.WorkEffortQuoteItems}">
- <link target="/ListWorkEffortQuoteItems?workEffortId=${workEffortId}"/>
- </menu-item>
- <menu-item name="WorkEffortRequirements" title="${uiLabelMap.WorkEffortRequirements}">
- <link target="/ListWorkEffortRequirements?workEffortId=${workEffortId}"/>
- </menu-item>
- <menu-item name="WorkEffortShopLists" title="${uiLabelMap.WorkEffortShopLists}">
- <link target="/ListWorkEffortShopLists?workEffortId=${workEffortId}"/>
- </menu-item>
<menu-item name="WorkEffortOrderHeaders" title="${uiLabelMap.WorkEffortOrderHeaders}">
- <link target="/ListWorkEffortOrderHeaders?workEffortId=${workEffortId}"/>
+ <link target="ListWorkEffortOrderHeaders?workEffortId=${workEffortId}"/>
</menu-item>
</menu>
</menus>
Modified: trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -32,7 +32,7 @@
</actions>
<field name="workEffortId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview?order_id=${orderId}&orderId=${orderId}&workEffortId=${workEffortId}" target-type="inter-app" description="[${orderId}]"/>
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview?order_id=${orderId}&orderId=${orderId}&workEffortId=${workEffortId}" target-type="inter-app"/>
</field>
<field name="statusItemDescription"><display/></field>
<field name="orderTypeDescription"><display/></field>
@@ -40,7 +40,6 @@
<field name="grandTotal"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext"><hyperlink target="deleteWorkEffortOrderHeader?workEffortId=${workEffortId}&orderId=${orderId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field>
</form>
-
<form name="AddWorkEffortOrderHeader" target="createWorkEffortOrderHeader" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="workEffortId"><hidden/></field>
Modified: trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -31,16 +31,14 @@
</condition-list>
</entity-condition>
</actions>
- <field name="workEffortId">
- <hyperlink also-hidden="false" description="[${workEffortId}]" target="EditWorkEffortPartyAssign?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}" link-style="linktext"/>
- </field>
+ <field name="workEffortId"><hidden/></field>
<field name="partyId" title="${uiLabelMap.WorkEffortParty}" widget-style="buttontext">
<display-entity entity-name="Person" description="${firstName} ${lastName}">
<sub-hyperlink target="/party/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="linktext"/>
</display-entity>
</field>
<field name="fromDate"><display/></field>
- <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"><display-entity entity-name="RoleType"/></field>
<field name="statusDateTime"><display/></field>
<field name="thruDate"><date-time/></field>
@@ -52,8 +50,7 @@
</entity-options>
</drop-down>
</field>
- <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
- <field name="expectationEnumId">
+ <field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_EXPECT"/>
@@ -61,15 +58,16 @@
</entity-options>
</drop-down>
</field>
+ <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
<field name="mustRsvp"><check/></field>
- <field name="comments"><textarea/></field>
+ <field name="comments"><text size="60" maxlength="255"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="EditWorkEffortPartyAssign" default-map-name="workEffortPartyAssignment" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="updateWorkEffortPartyAssign" title="" type="single">
<alt-target target="createWorkEffortPartyAssign" use-when="workEffortPartyAssignment==null"/>
- <field name="workEffortId"><display/></field>
+ <field name="workEffortId"><hidden/></field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
- <field name="roleTypeId">
+ <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down>
<entity-options entity-name="RoleType" description="${description}">
<entity-order-by field-name="description"/>
@@ -87,8 +85,7 @@
</entity-options>
</drop-down>
</field>
- <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
- <field name="expectationEnumId">
+ <field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_EXPECT"/>
@@ -96,8 +93,9 @@
</entity-options>
</drop-down>
</field>
+ <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
<field name="mustRsvp" widget-style="tabletext"><check/></field>
- <field name="comments"><textarea/></field>
- <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="comments"><text size="60" maxlength="255"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
Modified: trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -1,143 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+* Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
- <form name="ListWorkEffortQuotes" separate-columns="true" default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="tabletext" target="ListWorkEffortQuotes" title="" type="list" >
+ <form name="ListWorkEffortQuotes" separate-columns="true" target="ListWorkEffortQuotes" title="" type="list"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
<actions>
<entity-and entity-name="WorkEffortQuoteView">
<field-map field-name="workEffortId"/>
</entity-and>
</actions>
- <field name="workEffortId" widget-style="buttontext" >
- <hyperlink description="[${workEffortId}]" target="EditWorkEffort?workEffortId=${workEffortId}" />
- </field>
- <field name="quoteId" widget-style="buttontext" >
- <hyperlink description="[${quoteId}]" target="/ordermgr/control/EditQuote?quoteId=${quoteId}" target-type="inter-app" />
- </field>
+ <field name="workEffortId"><hidden/></field>
+ <field name="quoteId" widget-style="buttontext"><hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote?quoteId=${quoteId}" target-type="inter-app"/></field>
<field name="quoteName"><display/></field>
<field name="description"><display/></field>
<field name="statusItemDescription"><display/></field>
<field name="issueDate"><display/></field>
- <field name="editLink" widget-style="buttontext" title=" " >
- <hyperlink description="[${uiLabelMap.CommonEdit}]" target="EditWorkEffortQuote?workEffortId=${workEffortId}&quoteId=${quoteId}" link-style="linktext"/>
- </field>
<field name="deleteLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="deleteWorkEffortQuote?workEffortId=${workEffortId}&quoteId=${quoteId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuote?workEffortId=${workEffortId}&quoteId=${quoteId}"/>
</field>
</form>
-
- <form name="AddWorkEffortQuote"
- default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="inputBox"
- extends="EditQuote" extends-resource="component://order/webapp/ordermgr/quote/QuoteForms.xml"
- target="createWorkEffortQuote" title="" type="single">
- <sort-order>
- <sort-field name="workEffortId"/>
- <banner left-text-style="tabletext" left-text="Enter existing Quote Id below"/>
- <sort-field name="quoteId"/>
- <banner left-text-style="tabletext" left-text="OR add new Quote data below to create new entity (leave Cust Quote Id empty)"/>
- </sort-order>
- <field name="workEffortId"><display/></field>
- <field name="quoteId"><lookup target-form-name="/ordermgr/control/LookupQuote"/></field>
- <field name="quoteName" title="Quote Name"><text/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext">
- <submit button-type="text-link"/>
- </field>
+ <form name="AddWorkEffortQuote" target="createWorkEffortQuote" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <field name="workEffortId"><hidden/></field>
+ <field name="quoteId"><lookup target-form-name="LookupQuote"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
- <form name="EditWorkEffortQuote" default-map-name="quote"
- default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="inputBox"
- extends="EditQuote" extends-resource="component://order/webapp/ordermgr/quote/QuoteForms.xml"
- target="updateWorkEffortQuote" title="" type="single">
+
+ <form name="ListWorkEffortQuoteItems" separate-columns="true" target="ListWorkEffortQuoteItems" title="" type="list"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
<actions>
- <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
- <field-map field-name="statusId" env-name="quote.statusId"/>
- </entity-one>
- </actions>
- <field name="workEffortId" field-name="workEffortId" map-name="parameters">
- <hidden/>
- </field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext">
- <submit button-type="text-link"/>
- </field>
- </form>
- <form name="ListWorkEffortQuoteItems" separate-columns="true" default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="tabletext" target="ListWorkEffortQuoteItems" title="" type="list" >
- <actions>
<entity-and entity-name="QuoteItem">
<field-map field-name="workEffortId"/>
</entity-and>
</actions>
- <field name="workEffortId" widget-style="buttontext" field-name="workEffortId" map-name="parameters"><display /></field>
- <field name="quoteId" widget-style="buttontext"><display/></field>
+ <field name="workEffortId"><hidden/></field>
+ <field name="quoteId" widget-style="buttontext"><hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote?quoteId=${quoteId}" target-type="inter-app"/></field>
<field name="quoteItemSeqId" widget-style="buttontext">
- <hyperlink description="[${quoteItemSeqId}]" target="/ordermgr/control/EditQuoteItem?workEffortId=${workEffortId}&quoteId=${quoteId}&quoteItemSeqId=${quoteItemSeqId}" target-type="inter-app"/>
+ <hyperlink description="${quoteItemSeqId}" target="/ordermgr/control/EditQuoteItem?workEffortId=${workEffortId}&quoteId=${quoteId}&quoteItemSeqId=${quoteItemSeqId}" target-type="inter-app"/>
</field>
<field name="productId"><display/></field>
- <field name="custRequestId"><display /></field>
- <field name="custRequestItemSeqId"><display /></field>
+ <field name="custRequestId"><display/></field>
+ <field name="custRequestItemSeqId"><display/></field>
<field name="estimatedDeliveryDate"><display/></field>
<field name="comments"><display/></field>
- <field name="editLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="[${uiLabelMap.CommonEdit}]" target="EditWorkEffortQuoteItem?workEffortId=${workEffortId}&quoteId=${quoteId}&quoteItemSeqId=${quoteItemSeqId}"/>
- </field>
<field name="deleteLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="deleteWorkEffortQuoteItem?workEffortId=${workEffortId}&quoteId=${quoteId}&quoteItemSeqId=${quoteItemSeqId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuoteItem?workEffortId=${workEffortId}&quoteId=${quoteId}&quoteItemSeqId=${quoteItemSeqId}"/>
</field>
</form>
-
<form name="AddWorkEffortQuoteItem"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
- extends="EditQuoteItem" extends-resource="component://order/webapp/ordermgr/quote/QuoteForms.xml"
target="createWorkEffortQuoteItem" title="" type="single">
- <sort-order>
- <sort-field name="workEffortId"/>
- <sort-field name="quoteId"/>
- <sort-field name="quoteItemSeqId"/>
- </sort-order>
- <field name="workEffortId"><display/></field>
- <field name="quoteId"><lookup target-form-name="/ordermgr/control/LookupQuote"/></field>
- <field name="quoteItemSeqId"><lookup target-form-name="/ordermgr/control/LookupQuoteItem" target-parameter="quoteId"/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="workEffortId"><hidden/></field>
+ <field name="quoteId"><lookup target-form-name="LookupQuote"/></field>
+ <field name="quoteItemSeqId"><lookup target-form-name="LookupQuoteItem" target-parameter="quoteId"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
- <form name="EditWorkEffortQuoteItem" default-map-name="quoteItem"
- default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="inputBox"
- extends="EditQuoteItem" extends-resource="component://order/webapp/ordermgr/quote/QuoteForms.xml"
- target="updateWorkEffortQuoteItem" title="" type="single">
- <sort-order>
- <sort-field name="workEffortId"/>
- <sort-field name="quoteId"/>
- <sort-field name="quoteItemSeqId"/>
- </sort-order>
- <field name="workEffortId" map-name="parameters" field-name="workEffortId"><display/></field>
- <field name="quoteId"><display/></field>
- <field name="quoteItemSeqId"><display/></field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext">
- <submit button-type="text-link"/>
- </field>
- </form>
</forms>
Deleted: trunk/applications/workeffort/widget/WorkEffortQuoteScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortQuoteScreens.xml 2005-10-12 04:41:24 UTC (rev 5946)
+++ trunk/applications/workeffort/widget/WorkEffortQuoteScreens.xml 2005-10-12 08:55:49 UTC (rev 5947)
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * $Id: CommonScreens.xml 5462 2005-08-05 18:35:48Z jonesde $
--->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="AddWorkEffortQuote">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortQuote"/>
- <set field="tabButtonItem" value="WorkEffortQuotes"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortQuote"/>
-
- <set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one entity-name="Quote" value-name="quote"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
- <decorator-section name="body">
- <label style="head1">${uiLabelMap.PageTitleAddWorkEffortQuote}</label>
- <include-form name="AddWorkEffortQuote" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="EditWorkEffortQuote">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleEditWorkEffortQuote"/>
- <set field="tabButtonItem" value="WorkEffortQuotes"/>
- <set field="labelTitleProperty" value="PageTitleEditWorkEffortQuote"/>
-
- <set field="donePage" from-field="parameters.DONE_PAGE" />
- <set field="quoteId" from-field="parameters.quoteId"/>
- <set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one entity-name="Quote" value-name="quote"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
- <decorator-section name="body">
- <label style="head1">${uiLabelMap.PageTitleEditWorkEffortQuote}</label>
- <include-form name="EditWorkEffortQuote" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="ListWorkEffortQuotes">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleListWorkEffortQuotes"/>
- <set field="tabButtonItem" value="WorkEffortQuotes"/>
- <set field="labelTitleProperty" value="PageTitleListWorkEffortQuotes"/>
-
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
- <set field="workEffortId" from-field="parameters.workEffortId"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
- <decorator-section name="body">
- <container><label style="head1">${uiLabelMap.PageTitleListWorkEffortQuotes}</label></container>
- <container><link target="AddWorkEffortQuote?workEffortId=${workEffortId}" text="[Create New Quote]" style="linktext"></link></container>
- <include-form name="ListWorkEffortQuotes" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="AddWorkEffortQuoteItem">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortQuoteItem"/>
- <set field="tabButtonItem" value="WorkEffortQuoteItems"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortQuoteItem"/>
-
- <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
- <set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one entity-name="QuoteItem" value-name="quoteItem"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
- <decorator-section name="body">
- <label style="head1">${uiLabelMap.PageTitleAddWorkEffortQuoteItem}</label>
- <include-form name="AddWorkEffortQuoteItem" location="compo