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 2009/06/30 16:58:31 UTC
svn commit: r789778 - in /ofbiz/trunk: applications/order/config/
applications/order/webapp/ordermgr/request/
applications/order/widget/ordermgr/ specialpurpose/myportal/data/
specialpurpose/projectmgr/widget/forms/
Author: hansbak
Date: Tue Jun 30 14:58:30 2009
New Revision: 789778
URL: http://svn.apache.org/viewvc?rev=789778&view=rev
Log:
more corrections on the customer request list shown to a customer
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=789778&r1=789777&r2=789778&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue Jun 30 14:58:30 2009
@@ -1650,6 +1650,9 @@
<value xml:lang="zh">åæ¶å
¨é¨æç»</value>
<value xml:lang="zh_CN">åæ¶ææ项ç®</value>
</property>
+ <property key="OrderCancelledMyCustomerRequests">
+ <value xml:lang="en">My Cancelled Customer Requests</value>
+ </property>
<property key="OrderCancelOrder">
<value xml:lang="de">Auftrag annullieren</value>
<value xml:lang="en">Cancel Order</value>
@@ -1977,6 +1980,9 @@
<value xml:lang="zh">å·²å®æ</value>
<value xml:lang="zh_CN">å®æ</value>
</property>
+ <property key="OrderCompletedMyCustomerRequests">
+ <value xml:lang="en">My Completed customer requests</value>
+ </property>
<property key="OrderConfigure">
<value xml:lang="de">Konfigurieren</value>
<value xml:lang="en">Configure</value>
@@ -4609,6 +4615,9 @@
<value xml:lang="th">à¸à¸²à¸¢</value>
<value xml:lang="zh">éå®ä¸</value>
</property>
+ <property key="OrderOpenCollequeCustomerRequests">
+ <value xml:lang="en">Open Customer requests from my Colleques</value>
+ </property>
<property key="OrderOpenMyCustomerRequests">
<value xml:lang="en">My Open Customer Requests</value>
<value xml:lang="fr">Mes demandes de clients en-cours</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=789778&r1=789777&r2=789778&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Tue Jun 30 14:58:30 2009
@@ -230,11 +230,13 @@
<alt-target use-when="custRequest==null" target="createrequest"/>
<auto-fields-service service-name="updateCustRequest" default-field-type="edit"/>
<field name="custRequestId"><hidden/></field>
+ <field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field>
<field name="custRequestTypeId">
<drop-down allow-empty="false">
<entity-options entity-name="CustRequestType" description="${description}"/>
</drop-down>
</field>
+ <field name="custRequestName"><text default-value="${communicationEvent.subject}"/></field>
<field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
@@ -271,6 +273,7 @@
<option key="9(Lowest)"/>
</drop-down>
</field>
+ <field name="description" parameter-name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field>
<field name="maximumAmountUomId">
<drop-down allow-empty="true">
<entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
@@ -286,7 +289,6 @@
</field>
<field name="custRequestDate" title="${uiLabelMap.OrderRequestDate}"><date-time type="timestamp"/></field>
<field name="responseRequiredDate"><date-time type="timestamp"/></field>
- <!--<field name="requestPartyId" use-when="custRequest==null" title="Requesting Party"><lookup target-form-name="LookupPartyName"/></field>-->
<field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}">
<lookup target-form-name="LookupPartyName"/>
</field>
@@ -673,7 +675,7 @@
</field>
<field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field>
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
- <field name="priority">
+ <field name="priority" use-when="!statusId.equals("CRQ_COMPLETED")">
<drop-down allow-empty="true">
<option key="1(Highest)"/>
<option key="2"/>
@@ -686,7 +688,8 @@
<option key="9(Lowest)"/>
</drop-down>
</field>
- <field name="updateButton" widget-style="smallSubmit"><submit /></field>
+ <field name="priority" use-when="statusId.equals("CRQ_COMPLETED")"><display/></field>
+ <field name="updateButton" widget-style="smallSubmit" use-when="!statusId.equals("CRQ_COMPLETED")"><submit /></field>
<field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanEndDate}"><display type="date"/></field>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=789778&r1=789777&r2=789778&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Tue Jun 30 14:58:30 2009
@@ -588,7 +588,6 @@
<actions>
<script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
<set field="fromPartyId" from-field="userLogin.partyId"/>
- <set field="screenletTitle" from-field="uiLabelMap.OrderOpenMyCustomerRequests"/>
</actions>
<widgets>
<section>
@@ -608,6 +607,7 @@
<if-compare field="statusGroup" operator="equals" value="OPEN"/>
</condition>
<actions>
+ <set field="screenletTitle" from-field="uiLabelMap.OrderOpenMyCustomerRequests"/>
<entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-empty="true"/>
@@ -630,9 +630,10 @@
<if-compare field="statusGroup" operator="equals" value="COMPLETED"/>
</condition>
<actions>
+ <set field="screenletTitle" from-field="uiLabelMap.OrderCompletedMyCustomerRequests"/>
<entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
<condition-list combine="and">
- <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-null="true"/>
+ <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-empty="true"/>
<condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/>
<condition-expr field-name="fromPartyId" operator="not-equals" from-field="notFromPartyId" ignore-if-empty="true"/>
<condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/>
@@ -648,6 +649,7 @@
<if-compare field="statusGroup" operator="equals" value="CANCELLED"/>
</condition>
<actions>
+ <set field="screenletTitle" from-field="uiLabelMap.OrderCancelledMyCustomerRequests"/>
<entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-null="true"/>
@@ -666,14 +668,18 @@
</section>
<section>
<condition>
- <and>
- <if-compare field="statusGroup" operator="equals" value="OPEN"/>
- <if-compare field="otherContacts" operator="not-equals" value="Y"/>
- </and>
+ <if-compare field="otherContacts" operator="not-equals" value="Y"/>
</condition>
<widgets>
- <screenlet title="${screenletTitle} ${fromPartyId}" navigation-form-name="ListCustRequests" >
- <link target="EditRequestCustomer" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
+ <screenlet title="${screenletTitle} ${fromPartyId}" navigation-form-name="ListCustRequests">
+ <section>
+ <condition>
+ <if-compare field="statusGroup" operator="equals" value="OPEN"/>
+ </condition>
+ <widgets>
+ <link target="EditRequestCustomer" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
+ </widgets>
+ </section>
<include-form name="ListMyCustRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</widgets>
@@ -682,8 +688,11 @@
<condition>
<not><if-empty field="custRequests"/></not>
</condition>
+ <actions>
+ <set field="screenletTitle" from-field="uiLabelMap.OrderOpenCollequeCustomerRequests"/>
+ </actions>
<widgets>
- <screenlet title="${screenletTitle} ${fromPartyId}" navigation-form-name="ListCustRequests" >
+ <screenlet title="${screenletTitle}" navigation-form-name="ListCustRequests" >
<include-form name="ListCustRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</widgets>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=789778&r1=789777&r2=789778&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Jun 30 14:58:30 2009
@@ -21,10 +21,6 @@
<RoleType description="Email Administrator" hasTable="N" parentTypeId="PERSON_ROLE" roleTypeId="EMAIL_ADMIN"/>
- <!-- ProductStoreEmailSetting for send auto email to customer when CustRequest completed -->
- <Enumeration description="Customer Request Created" enumCode="CUST_CREATED" enumId="PRDS_CUST_CREATED" sequenceId="17" enumTypeId="PRDS_EMAIL"/>
- <Enumeration description="Customer Request Completed" enumCode="CUST_COMPLETE" enumId="PRDS_CUST_CONFIRM" sequenceId="18" enumTypeId="PRDS_EMAIL"/>
-
<!-- PortalPortlet System provided pages -->
<!-- no security group -->
<PortalPage portalPageId="MYPORTAL_NONE" sequenceNum="0" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_"/><!-- user belonging to no portal security group -->
@@ -121,15 +117,21 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+ <!-- open 'own' customer requests -->
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" attrName="statusGroup" attrValue="OPEN"/>
+ <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" attrName="otherContacts" attrValue="N"/>
+ <!-- completed 'own' customer requests -->
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" columnSeqId="00001" sequenceNum="2"/>
<PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="statusGroup" attrValue="COMPLETED"/>
- <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" columnSeqId="00001" sequenceNum="2"/>
- <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="statusGroup" attrValue="OPEN"/>
+ <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="otherContacts" attrValue="N"/>
+ <!-- open 'other people in same company' customer requests -->
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00003" columnSeqId="00001" sequenceNum="4"/>
+ <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00003" attrName="statusGroup" attrValue="OPEN"/>
+ <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00003" attrName="otherContacts" attrValue="Y"/>
- <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="otherContacts" attrValue="Y"/>
- <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
+ <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="MyCommunications" portletSeqId="00001" attrName="internalNotesOnly" attrValue="Y"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="8"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="10"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=789778&r1=789777&r2=789778&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Jun 30 14:58:30 2009
@@ -31,14 +31,14 @@
<form name="EditCustRequest" type="single" target="createrequest" title="Request" default-map-name="custRequest"
extends="EditSmallCustRequest" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
<alt-target use-when="custRequest!=null" target="updaterequest"/>
- <field name="custRequestName"><text default-value="${communicationEvent.subject}"/></field>
+ <!--field name="custRequestName"><text default-value="${communicationEvent.subject}"/></field-->
<field name="shortDescription" parameter-name="description" use-when="custRequest==null" encode-output="false"><text/></field>
- <field name="description" parameter-name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field>
+ <!--field name="description" parameter-name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field-->
<field name="workEffortName"><hidden value="${custRequestName}"/></field>
<field name="workEffortId"><hidden value="${custRequestId}"/></field>
<field name="workEffortTypeId"><hidden value="TASK"/></field>
<field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
- <field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field>
+ <!--field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field-->
<field name="childWorkEffortId" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
<drop-down allow-empty="true">
<entity-options entity-name="WorkEffortAndChild" description="${workEffortName} -- ${childWorkEffortName}">