svn commit: r759674 - in /ofbiz/trunk: applications/order/ applications/order/config/ applications/order/data/ applications/order/widget/orde
Locked
svn commit: r759674 - in /ofbiz/trunk: applications/order/ applications/order/config/ applications/order/data/ applications/order/widget/orde
 
|
Author: hansbak
Date: Sun Mar 29 12:56:50 2009 New Revision: 759674 URL: http://svn.apache.org/viewvc?rev=759674&view=rev Log: move incoming cust request back from myportal into order and update party portlet descriptions and portlet categories Added: ofbiz/trunk/applications/order/data/OrderPortletData.xml (with props) Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml ofbiz/trunk/applications/order/ofbiz-component.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml ofbiz/trunk/applications/party/data/PartyPortletData.xml ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=759674&r1=759673&r2=759674&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sun Mar 29 12:56:50 2009 @@ -3229,6 +3229,12 @@ <value xml:lang="th">รวม</value> <value xml:lang="zh">å æ¬</value> </property> + <property key="OrderIncomingCustRequests"> + <value xml:lang="en">Incoming customer requests</value> + <value xml:lang="fr">Nouvelles demandes utilisateur</value> + <value xml:lang="it">Richiesta cliente in entrata</value> + <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸£à¸±à¸à¸à¸à¸à¸¥à¸¹à¸à¸à¹à¸²</value> + </property> <property key="OrderInformationAboutYou"> <value xml:lang="de">Informationen zu Ihnen</value> <value xml:lang="en">Information about you</value> Added: ofbiz/trunk/applications/order/data/OrderPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=759674&view=auto ============================================================================== --- ofbiz/trunk/applications/order/data/OrderPortletData.xml (added) +++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Sun Mar 29 12:56:50 2009 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<entity-engine-xml> + + <!-- customer requests --> + <PortletCategory portletCategoryId="CUST_REQUEST" description="Customer Requests"/> + <PortalPortlet portalPortletId="INCOM_CUST_REQUESTS" + portletName="Incoming Cust.Requests" + screenName="IncomingCustRequests" screenLocation="component://order/widget/ordermgr/RequestScreens.xml" + description="List Request List for a request taker" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> + <PortletPortletCategory portalPortletId="INCOM_CUST_REQUESTS" portletCategoryId="CUST_REQUEST"/> + +</entity-engine-xml> Propchange: ofbiz/trunk/applications/order/data/OrderPortletData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/data/OrderPortletData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/order/data/OrderPortletData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/order/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=759674&r1=759673&r2=759674&view=diff ============================================================================== --- ofbiz/trunk/applications/order/ofbiz-component.xml (original) +++ ofbiz/trunk/applications/order/ofbiz-component.xml Sun Mar 29 12:56:50 2009 @@ -31,6 +31,7 @@ <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/> <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=759674&r1=759673&r2=759674&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Sun Mar 29 12:56:50 2009 @@ -496,4 +496,34 @@ </widgets> </section> </screen> + + <screen name="IncomingCustRequests"> + <section> + <actions> + <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/> + <condition-list combine="and"> + <condition-expr field-name="roleTypeIdTo" operator="equals" value="REQ_TAKER"/> + <condition-expr field-name="partyIdTo" operator="equals" from-field="userLogin.partyId"/> + </condition-list> + </condition-list> + <order-by field-name="-custRequestDate"/> + </entity-condition> + </actions> + <widgets> + <section> + <condition> + <not><if-empty field="custRequests"/></not> + </condition> + <widgets> + <screenlet title="${uiLabelMap.OrderIncomingCustRequests}" navigation-form-name="ListRequestList"> + <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> + </widgets> + </section> + </widgets> + </section> + </screen> + </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=759674&r1=759673&r2=759674&view=diff ============================================================================== --- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original) +++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Sun Mar 29 12:56:50 2009 @@ -20,55 +20,85 @@ <entity-engine-xml> <!-- party --> - <PortalPortlet portalPortletId="party" portletName="Party Info" screenName="Party" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" description="General information about a person or party group" /> - - <!-- communications --> - <PortalPortlet portalPortletId="MyCommunications" portletName="My Communications" description="Communication list" - screenName="MyCommunicationEvents" - screenLocation="component://party/widget/partymgr/CommunicationScreens.xml" - editFormName="EditPartyId" editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml" /> + <PortletCategory portletCategoryId="PROFILE" description="Profiles"/> + <PortalPortlet portalPortletId="party" + portletName="Party Info" + screenName="Party" + screenLocation="component://party/widget/partymgr/ProfileScreens.xml" description="General information about a person or party group" /> + <PortletPortletCategory portalPortletId="party" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="Attributes" portletName="Attributes" screenName="Attributes" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Attributes in myportal from party" /> + description="Attributes of a party" /> + <PortletPortletCategory portalPortletId="Attributes" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings" screenName="AvsSettings" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Avs Settings in myportal from party" /> + description="Avs Settings of a party" /> + <PortletPortletCategory portalPortletId="AvsSettings" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="Content" portletName="Content" screenName="Content" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Content in myportal from party" /> + description="Attached Content of a party" /> + <PortletPortletCategory portalPortletId="Content" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="LoyaltyPoints" portletName="Loyalty Points" screenName="LoyaltyPoints" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Loyalty Points in myportal from party" /> + description="Loyalty Points of a party" /> + <PortletPortletCategory portalPortletId="LoyaltyPoints" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="MYTASKSPARTY" portletName="My Tasks From Party" screenName="mytasks" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="My Tasks in myportal from party" /> + description="Assigned Tasks of a party" /> + <PortletPortletCategory portalPortletId="MYTASKSPARTY" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="Notes" portletName="Notes" screenName="Notes" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Notes in myportal from party" /> + description="Notes of a party" /> + <PortletPortletCategory portalPortletId="Notes" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="PaymentMethods" portletName="Payment Methods" screenName="PaymentMethods" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="PaymentMethods in myportal from party" /> + description="PaymentMethods of a party" /> + <PortletPortletCategory portalPortletId="PaymentMethods" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="ShipperAccount" portletName="Shipper Account" screenName="ShipperAccount" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Shipper Account in myportal from party" /> + description="Shipper Accounts of a party" /> + <PortletPortletCategory portalPortletId="ShipperAccount" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="UserLogin" portletName="User Login" screenName="UserLogin" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="User Login in myportal from party" /> + description="User Logins of a party" /> + <PortletPortletCategory portalPortletId="UserLogin" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="Visits" portletName="Visits" screenName="Visits" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Visits in myportal from party" /> + description="Visits of a certain party" /> + <PortletPortletCategory portalPortletId="Visits" portletCategoryId="PROFILE"/> + <PortalPortlet portalPortletId="contact" portletName="Contact" screenName="Contact" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="contact in myportal from party" /> + description="contact methods of a party" /> + <PortletPortletCategory portalPortletId="contact" portletCategoryId="PROFILE"/> + + <!-- communications --> + <PortletCategory portletCategoryId="COMMUNICATIONS" description="Communication(s)"/> + <PortalPortlet portalPortletId="MyCommunications" portletName="My Communications" description="IN and outgoing Communication list of a party" + screenName="MyCommunicationEvents" + screenLocation="component://party/widget/partymgr/CommunicationScreens.xml" + editFormName="EditPartyId" editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml" /> + <PortletPortletCategory portalPortletId="MyCommunications" portletCategoryId="COMMUNICATIONS"/> + </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=759674&r1=759673&r2=759674&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Sun Mar 29 12:56:50 2009 @@ -83,12 +83,6 @@ <value xml:lang="it">Nome mancante</value> <value xml:lang="th">à¸à¸£à¸¸à¸à¸²à¸à¸£à¸à¸à¸à¸·à¹à¸à¸à¸à¸à¸à¹à¸²à¸</value> </property> - <property key="MyPortalIncomingCustRequests"> - <value xml:lang="en">Incoming customer requests</value> - <value xml:lang="fr">Nouvelles demandes utilisateur</value> - <value xml:lang="it">Richiesta cliente in entrata</value> - <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸£à¸±à¸à¸à¸à¸à¸¥à¸¹à¸à¸à¹à¸²</value> - </property> <property key="MyPortalInformation"> <value xml:lang="en">My Information</value> <value xml:lang="fr">Mes informations </value> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=759674&r1=759673&r2=759674&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Sun Mar 29 12:56:50 2009 @@ -73,16 +73,12 @@ <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001" /> <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" /> - <PortletCategory portletCategoryId="PROFILE" description="Profiles"/> - <PortletCategory portletCategoryId="COMMUNICATIONS" description="Communication(s)"/> <PortletCategory portletCategoryId="TASKS" description="Task(s)"/> <PortletCategory portletCategoryId="TIMESHEETS" description="Timesheet(s)"/> - <PortletCategory portletCategoryId="LIST_REQUEST" description="List(s) Request"/> <PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) of Customer" /> <PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="mytasks" portletName="My Tasks" screenName="MyTasks" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Tasks From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> - <PortalPortlet portalPortletId="listrequestlist" portletName="List Request List" screenName="ListRequestList" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Request List From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="mytimesheet" portletName="My Timesheet" screenName="MyTimesheet" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Timesheet From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="ListInvoices" portletName="List Invoices" screenName="ListInvoices" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Invoices From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="ListCustRequests" portletName="List Cust Requests" screenName="ListCustRequests" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> @@ -92,7 +88,7 @@ <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> - <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="INCOM_CUST_REQUESTS" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> @@ -112,7 +108,7 @@ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> - <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="INCOM_CUST_REQUESTS" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> @@ -142,25 +138,11 @@ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> - - <PortletPortletCategory portalPortletId="Attributes" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="AvsSettings" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="Content" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="LoyaltyPoints" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="MYTASKSPARTY" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="Notes" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="PaymentMethods" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="ShipperAccount" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="UserLogin" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="Visits" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="contact" portletCategoryId="PROFILE"/> - <PortletPortletCategory portalPortletId="party" portletCategoryId="PROFILE"/> <PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="COMMUNICATIONS"/> <PortletPortletCategory portalPortletId="mytasks" portletCategoryId="TASKS"/> <PortletPortletCategory portalPortletId="mytimesheet" portletCategoryId="TIMESHEETS"/> - <PortletPortletCategory portalPortletId="listrequestlist" portletCategoryId="LIST_REQUEST"/> <PortletPortletCategory portalPortletId="ListInvoices" portletCategoryId="LIST_CUSTOMER"/> <PortletPortletCategory portalPortletId="ListCustRequests" portletCategoryId="LIST_CUSTOMER"/> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=759674&r1=759673&r2=759674&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Mar 29 12:56:50 2009 @@ -430,39 +430,6 @@ </section> </screen> - <screen name="ListRequestList"> - <section> - <actions> - <service service-name="getUserPreferenceGroup" result-map="preferences"> - <field-map field-name="userPrefGroupTypeId" value="MyPortal"/> - </service> - <!-- check if there are any customer requests for this user --> - <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel"> - <condition-list combine="and"> - <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/> - <condition-list combine="and"> - <condition-expr field-name="roleTypeIdTo" operator="equals" value="REQ_TAKER"/> - <condition-expr field-name="partyIdTo" operator="equals" from-field="userLogin.partyId"/> - </condition-list> - </condition-list> - <order-by field-name="-custRequestDate"/> - </entity-condition> - </actions> - <widgets> - <section> - <condition> - <not><if-empty field="custRequests"/></not> - </condition> - <widgets> - <screenlet title="${uiLabelMap.MyPortalIncomingCustRequests}" navigation-form-name="ListRequestList"> - <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> - </widgets> - </section> - </widgets> - </section> - </screen> - <screen name="ListCustRequests"> <section> <actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |