You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/08/26 12:31:28 UTC
svn commit: r689020 - in /ofbiz/trunk/specialpurpose/mypage:
config/MyPageUiLabels.xml widget/CommonScreens.xml widget/MyPageForms.xml
Author: hansbak
Date: Tue Aug 26 03:31:27 2008
New Revision: 689020
URL: http://svn.apache.org/viewvc?rev=689020&view=rev
Log:
show separate lists for open and completed customer requests to the customer
Modified:
ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=689020&r1=689019&r2=689020&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Tue Aug 26 03:31:27 2008
@@ -70,6 +70,12 @@
<value xml:lang="en">My Information</value>
<value xml:lang="fr">Mes informations </value>
</property>
+ <property key="MyCompletedCustomerRequests">
+ <value xml:lang="en">My Completed Customer Requests</value>
+ </property>
+ <property key="MyOpenCustomerRequests">
+ <value xml:lang="en">My Open Customer Requests</value>
+ </property>
<property key="MyPageNoAccess1">
<value xml:lang="en">No Access priviledges has been setup.</value>
<value xml:lang="fr">Aucun accès provolégié n'a été paramétré.</value>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=689020&r1=689019&r2=689020&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Tue Aug 26 03:31:27 2008
@@ -279,19 +279,28 @@
<screen name="mainCustomer">
<section>
<actions>
+ <set field="headerItem" value="Main" />
<set field="partyId" from-field="userLogin.partyId"/>
<set field="status" from-field="parameters.status" default-value="open"/>
<set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/>
<entity-condition list-name="custRequests" entity-name="CustRequestInfoAndWorkEffort">
<condition-list combine="and">
- <condition-expr field-name="fromPartyId" operator="equals" value="userLogin.partyId"/>
+ <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/>
+ <condition-list combine="or">
+ <condition-expr field-name="statusId" operator="equals" value="CRQ_REVIEWED"/>
+ <condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
+ </condition-list>
+ </condition-list>
+ <order-by field-name="+priority"/>
+ <order-by field-name="+custRequestDate"/>
+ </entity-condition>
+ <entity-condition list-name="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffort">
+ <condition-list combine="and">
+ <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/>
+ <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/>
</condition-list>
- <order-by field-name="-custRequestDate"/>
+ <order-by field-name="custRequestDate"/>
</entity-condition>
- <entity-and list-name="custRequests" entity-name="CustRequestInfoAndWorkEffort">
- <field-map field-name="fromPartyId" env-name="userLogin.partyId"/>
- <order-by field-name="-custRequestDate"/>
- </entity-and>
<!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only -->
<entity-condition entity-name="CommunicationEventAndRole" list-name="commEvents">
<condition-list combine="and">
@@ -308,10 +317,14 @@
</entity-condition>
</actions>
<widgets>
- <screenlet title="${uiLabelMap.MyCustRequests}" navigation-form-name="ListRequestList" >
+ <screenlet title="${uiLabelMap.MyOpenCustomerRequests}" navigation-form-name="ListCustRequests" >
<link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
<include-form name="ListCustRequests" location="component://mypage/widget/MyPageForms.xml"/>
</screenlet>
+ <screenlet title="${uiLabelMap.MyCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
+ <include-form name="ListCustRequestsCompleted" location="component://mypage/widget/MyPageForms.xml"/>
+ <!-- include-form name="ListCustRequestsCompletedTotal" location="component://mypage/widget/MyPageForms.xml"/-->
+ </screenlet>
<screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents"
name="myComms">
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=689020&r1=689019&r2=689020&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Tue Aug 26 03:31:27 2008
@@ -159,6 +159,18 @@
<field name="plannedHours" map-name="taskResult.taskInfo"><display/></field>
<field name="actualHours" map-name="taskResult.taskInfo"><display/></field>
</form>
+ <form name="ListCustRequestsCompleted" extends="ListCustRequests" list-name="custRequestsCompleted">
+ <field name="priority"><display/></field>
+ <field name="updateButton"><ignored/></field>
+ <field name="currentStatusId"><ignored/></field>
+ </form>
+
+ <form name="ListCustRequestsCompletedTotal" type="single">
+ <actions>
+ <set field="TotalHoursThisMonth" value="33"/>
+ </actions>
+ <field name="TotalHoursThisMonth"><display/></field>
+ </form>
<form name="EditCustRequest" extends="EditCustRequest" extends-resource="component://projectmgr/widget/forms/RequestForms.xml">
<field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}"><hidden value="${userLogin.partyId}"/></field>