svn commit: r732223 - in /ofbiz/trunk/specialpurpose/my
Locked
 
|
Author: hansbak
Date: Tue Jan 6 21:25:17 2009 New Revision: 732223 URL: http://svn.apache.org/viewvc?rev=732223&view=rev Log: some more changes in the mypage to myportal conversion Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityData.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml Tue Jan 6 21:25:17 2009 @@ -36,7 +36,7 @@ <PartyRole partyId="admin" roleTypeId="ADDRESSEE"/> <CommunicationEventRole communicationEventId="9000" partyId="admin" roleTypeId="ADDRESSEE" contactMechId="admin" statusId="COM_ROLE_CREATED"/> - <!-- mypage users --> + <!-- myportal users --> <!-- demo customer read access to his own customer requests and related tasks including planning and actual hours--> <UserLoginSecurityGroup groupId="MYPORTAL_CUSTOMER" userLoginId="DemoCustomer" fromDate="2000-01-01 00:00:00.0"/> <!-- these customers also have access to the project manager (via rules in the project manager comp) --> @@ -53,7 +53,7 @@ <UserLoginSecurityGroup groupId="MYPORTAL_EMPLOYEE" userLoginId="admin" fromDate="2000-01-01 00:00:00.0"/> <UserLoginSecurityGroup groupId="MYPORTAL_EMPLOYEE" userLoginId="demoadmin" fromDate="2000-01-01 00:00:00.0"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_CONFIRM" bodyScreenLocation="component://myportal/widget/MyPageScreens.xml#CompletedCustRequestNotification" subject="OFBiz - Your Request Is Complete[${custRequestId}]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_CREATED" bodyScreenLocation="component://myportal/widget/MyPageScreens.xml#CreateCustRequestNotification" subject="OFBiz - Your Request Is Created[${custRequestId}]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_CONFIRM" bodyScreenLocation="component://myportal/widget/MyPortalScreens.xml#CompletedCustRequestNotification" subject="OFBiz - Your Request Is Complete[${custRequestId}]" fromAddress="[hidden email]"/> + <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_CREATED" bodyScreenLocation="component://myportal/widget/MyPortalScreens.xml#CreateCustRequestNotification" subject="OFBiz - Your Request Is Created[${custRequestId}]" fromAddress="[hidden email]"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityData.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityData.xml Tue Jan 6 21:25:17 2009 @@ -19,8 +19,8 @@ --> <entity-engine-xml> - <SecurityPermission permissionId="MYPORTAL_EMPLOYEE" description="Use the employee screens in mypage."/> - <SecurityGroup description="Employee user of mypage, Limited access to the projectmgr, comms,custRequests" groupId="MYPORTAL_EMPLOYEE"/> + <SecurityPermission permissionId="MYPORTAL_EMPLOYEE" description="Use the employee screens in myportal."/> + <SecurityGroup description="Employee user of myportal, Limited access to the projectmgr, comms,custRequests" groupId="MYPORTAL_EMPLOYEE"/> <SecurityGroupPermission groupId="MYPORTAL_EMPLOYEE" permissionId="MYPORTAL_EMPLOYEE"/> <SecurityGroupPermission groupId="MYPORTAL_EMPLOYEE" permissionId="PROJECTMGR_VIEW"/> <SecurityGroupPermission groupId="MYPORTAL_EMPLOYEE" permissionId="PROJECTMGR_ROLE_VIEW"/> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Jan 6 21:25:17 2009 @@ -27,49 +27,72 @@ <Enumeration description="Customer Request Completed" enumCode="CUST_COMPLETE" enumId="PRDS_CUST_CONFIRM" sequenceId="18" enumTypeId="PRDS_EMAIL"/> <!-- PortalPortlet Demo Data --> - <PortalPage portalPageId="MYPORTAL" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_"/> + <PortalPage portalPageId="MYPORTAL" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" /> <PortalPage portalPageId="00001" portalPageName="My Profile" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> <PortalPage portalPageId="00002" portalPageName="My Communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> - <PortalPage portalPageId="00003" portalPageName="Other Communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL"/> + <PortalPage portalPageId="00003" portalPageName="Other Communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> <PortalPage portalPageId="00004" portalPageName="Company communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> <PortalPage portalPageId="00005" portalPageName="My Time Sheets" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> <PortalPage portalPageId="00006" portalPageName="My Tasks" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> + <PortalPage portalPageId="00007" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="DemoEmployee" originalPortalPageId="MYPORTAL" /> + <PortalPage portalPageId="00008" portalPageName="My Profile" ownerUserLoginId="DemoEmployee" parentPortalPageId="MYPORTAL" /> + <PortalPage portalPageId="00009" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="DemoCustomer" originalPortalPageId="MYPORTAL" /> + <PortalPage portalPageId="00010" portalPageName="My Profile" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> + <PortalPage portalPageId="00011" portalPageName="Invoices" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> + <PortalPage portalPageId="00012" portalPageName="Projects" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> <PortalPageColumn portalPageId="MYPORTAL" columnSeqId="00001" /> - <PortalPageColumn portalPageId="00001" columnSeqId="00001" columnWidthPercentage="50" /> + <PortalPageColumn portalPageId="00001" columnSeqId="00001" columnWidthPercentage="50" /> <PortalPageColumn portalPageId="00001" columnSeqId="00002" columnWidthPercentage="50" /> <PortalPageColumn portalPageId="00002" columnSeqId="00001" /> <PortalPageColumn portalPageId="00003" columnSeqId="00001" /> <PortalPageColumn portalPageId="00004" columnSeqId="00001" /> <PortalPageColumn portalPageId="00005" columnSeqId="00001" /> <PortalPageColumn portalPageId="00006" columnSeqId="00001" /> + <PortalPageColumn portalPageId="00007" columnSeqId="00001" /> + <PortalPageColumn portalPageId="00008" columnSeqId="00001" columnWidthPercentage="50" /> + <PortalPageColumn portalPageId="00008" columnSeqId="00002" columnWidthPercentage="50" /> + <PortalPageColumn portalPageId="00009" columnSeqId="00001" /> + <PortalPageColumn portalPageId="00010" columnSeqId="00001" columnWidthPercentage="50" /> + <PortalPageColumn portalPageId="00011" columnSeqId="00001" /> + <PortalPageColumn portalPageId="00012" columnSeqId="00001" /> + <PortalPageColumn portalPageId="00010" columnSeqId="00002" columnWidthPercentage="50" /> - <PortalPortlet portalPortletId="Attributes" portletName="Attributes" screenName="Attributes" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Attributes in myportal from party" /> + <PortalPortlet portalPortletId="Attributes" portletName="Attributes" screenName="Attributes" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Attributes in myportal from party"/> <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings" screenName="AvsSettings" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Avs Settings in myportal from party" /> - <PortalPortlet portalPortletId="Cart" portletName="Cart" screenName="Cart" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Cart in myportal from party" /> <PortalPortlet portalPortletId="Content" portletName="Content" screenName="Content" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Content in myportal from party" /> - <PortalPortlet portalPortletId="FinAccounts" portletName="Fin Accounts" screenName="FinAccounts" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Fin Accounts in myportal from party" /> <PortalPortlet portalPortletId="LoyaltyPoints" portletName="Loyalty Points" screenName="LoyaltyPoints" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Loyalty Points in myportal from party" /> <PortalPortlet portalPortletId="MYTASKSPARTY" portletName="My Tasks From Party" screenName="mytasksParty" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Tasks in myportal from party" /> <PortalPortlet portalPortletId="Notes" portletName="Notes" screenName="Notes" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Notes in myportal from party" /> <PortalPortlet portalPortletId="PaymentMethods" portletName="Payment Methods" screenName="PaymentMethods" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="PaymentMethods in myportal from party" /> - <PortalPortlet portalPortletId="SerializedInventory" portletName="Serialized Inventory" screenName="SerializedInventory" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Serialized Inventory in myportal from party"/> <PortalPortlet portalPortletId="ShipperAccount" portletName="Shipper Account" screenName="ShipperAccount" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Shipper Account in myportal from party" /> - <PortalPortlet portalPortletId="Subscriptions" portletName="Subscriptions" screenName="Subscriptions" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Subscriptions in myportal from party" /> - <PortalPortlet portalPortletId="UserLogin" portletName="User Login" screenName="UserLogin" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="User Login in myportal from party"/> + <PortalPortlet portalPortletId="UserLogin" portletName="User Login" screenName="UserLogin" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="User Login in myportal from party" /> <PortalPortlet portalPortletId="ViewInternalOrg" portletName="View Internal Org" screenName="ViewInternalOrg" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="View Internal Org in myportal from party" /> <PortalPortlet portalPortletId="Visits" portletName="Visits" screenName="Visits" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Visits in myportal from party" /> <PortalPortlet portalPortletId="contact" portletName="Contact" screenName="Contact" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="contact in myportal from party" /> - <PortalPortlet portalPortletId="contactsAndAccounts" portletName="Contacts and Accounts" screenName="contactsAndAccounts" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Contacts and Accounts in myportal from party" /> <PortalPortlet portalPortletId="listrequestlist" portletName="List Request List" screenName="ListRequestList" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Request List From My Page" /> <PortalPortlet portalPortletId="mycommunications" portletName="My Communications" screenName="MyCommunications" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Communications From My Page" /> <PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" /> <PortalPortlet portalPortletId="mytasks" portletName="My Tasks" screenName="MyTasks" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Tasks From My Page" /> <PortalPortlet portalPortletId="mytimesheet" portletName="My Timesheet" screenName="MyTimesheet" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Timesheet From My Page" /> <PortalPortlet portalPortletId="otherCommunications" portletName="Other Communications" screenName="OtherCommunications" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Other Communications From My Page" /> - <PortalPortlet portalPortletId="party" portletName="Party" screenName="Party" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="profile in myportal from party" /> + <PortalPortlet portalPortletId="party" portletName="Party" screenName="Party" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="profile in myportal from party" /> + <PortalPortlet portalPortletId="contactsAndAccounts" portletName="Contacts And Accounts" screenName="contactsAndAccounts" screenLocation="component://example/widget/example/PortletScreens.xml" description="Contacts And Accounts From My Page" /> + <PortalPortlet portalPortletId="FinAccounts" portletName="FinAccounts" screenName="FinAccounts" screenLocation="component://example/widget/example/PortletScreens.xml" description="FinAccounts in myportal from party" /> + <PortalPortlet portalPortletId="Cart" portletName="Cart" screenName="Cart" screenLocation="component://example/widget/example/PortletScreens.xml" description="Cart in myportal from party" /> + <PortalPortlet portalPortletId="SerializedInventory" portletName="Serialized Inventory" screenName="SerializedInventory" screenLocation="component://example/widget/example/PortletScreens.xml" description="Serialized Inventory in myportal from party" /> + <PortalPortlet portalPortletId="Subscriptions" portletName="Sub Scriptions" screenName="Subscriptions" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Sub Scriptions in myportal from party" /> + <PortalPortlet portalPortletId="Communications" portletName="Communications" screenName="Communications" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Communications From MyPortal" /> + <PortalPortlet portalPortletId="ListInvoices" portletName="List Invoices" screenName="ListInvoices" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Invoices From MyPortal" /> + <PortalPortlet portalPortletId="ListCustRequests" portletName="List Cust Requests" screenName="ListCustRequests" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests From MyPortal" /> + <PortalPortlet portalPortletId="ListCustRequestsComp" portletName="List Cust Requests Completed" screenName="ListCustRequestsCompleted" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests Completed From MyPortal" /> + <PortalPortlet portalPortletId="ListPartyCommEvents" portletName="List Party Comm Events" screenName="ListPartyCommEvents" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Party Comm Events in myportal from party" /> + <PortalPortlet portalPortletId="ContentList" portletName="Content List" screenName="ContentList" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Content List in myportal from party" /> + <PortalPortlet portalPortletId="ListProjects" portletName="List Projects" screenName="ListProjects" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Projects From MyPortal" /> + <PortalPortlet portalPortletId="WELCOME" portletName="Welcome" screenName="welcomePortlet" screenLocation="component://common/widget/PortletScreens.xml" description="OFBiz Welcome Message" /> + <PortalPortlet portalPortletId="LOGIN" portletName="Login" screenName="loginPortlet" screenLocation="component://common/widget/PortletScreens.xml" editFormName="LoginPortletEdit" editFormLocation="component://common/widget/PortletEditForms.xml" description="Login Form" /> - <PortalPagePortlet portalPageId="MYPORTAL" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="MYPORTAL" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> <PortalPagePortlet portalPageId="00001" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> <PortalPagePortlet portalPageId="00001" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> <PortalPagePortlet portalPageId="00001" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> @@ -78,13 +101,46 @@ <PortalPagePortlet portalPageId="00001" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" /> <PortalPagePortlet portalPageId="00001" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> <PortalPagePortlet portalPageId="00001" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> - <PortalPagePortlet portalPageId="00001" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002"/> + <PortalPagePortlet portalPageId="00001" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> <PortalPagePortlet portalPageId="00001" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> <PortalPagePortlet portalPageId="00001" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> <PortalPagePortlet portalPageId="00001" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> <PortalPagePortlet portalPageId="00002" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" /> - <PortalPagePortlet portalPageId="00003" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001"/> + <PortalPagePortlet portalPageId="00003" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" /> <PortalPagePortlet portalPageId="00004" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" /> <PortalPagePortlet portalPageId="00005" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" /> - <PortalPagePortlet portalPageId="00006" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00006" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00007" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="-1" /> + <PortalPagePortlet portalPageId="00007" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> + <PortalPagePortlet portalPageId="00007" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> + <PortalPagePortlet portalPageId="00007" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="5" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="Content" portletSeqId="00002" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00008" portalPortletId="UserLogin" portletSeqId="00002" columnSeqId="00002" sequenceNum="0" /> + <PortalPagePortlet portalPageId="00009" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> + <PortalPagePortlet portalPageId="00009" portalPortletId="ListCustRequestsComp" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00009" portalPortletId="ListPartyCommEvents" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="0" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00010" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> + <PortalPagePortlet portalPageId="00011" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" /> + <PortalPagePortlet portalPageId="00012" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" /> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Jan 6 21:25:17 2009 @@ -85,7 +85,7 @@ include-user-login="false"/> <else> <add-error> - <fail-property property="NoAccess" resource="MyPageUiLabels"/> + <fail-property property="NoAccess" resource="MyPortalUiLabels"/> </add-error> </else> </if-compare> Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml Tue Jan 6 21:25:17 2009 @@ -45,7 +45,7 @@ </entity-one> <set field="setUserPref.userLoginId" from-field="userLogin.userLoginId"/> <set field="setUserPref.userLogin" from-field="userLogin"/> - <set field="setUserPref.userPrefGroupTypeId" value="MyPage"/> + <set field="setUserPref.userPrefGroupTypeId" value="MyPortal"/> <call-service service-name="setUserPreferenceGroup" in-map-name="setUserPref" include-user-login="false"/> </if-empty> <!-- if customer want to send email notification when customer request completed then send email--> Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Tue Jan 6 21:25:17 2009 @@ -297,14 +297,14 @@ <view-map name="otherCommunications" type="screen" page="component://myportal/widget/CommonScreens.xml#OtherCommunications"/> <view-map name="myCompanyComms" type="screen" page="component://myportal/widget/CommonScreens.xml#MyCompanyComms"/> <view-map name="myTimesheet" type="screen" page="component://myportal/widget/CommonScreens.xml#MyTimesheet"/> - <view-map name="newEvent" type="screen" page="component://myportal/widget/MyPageScreens.xml#newEvent"/> - <view-map name="ViewCommunicationEvent" type="screen" page="component://myportal/widget/MyPageScreens.xml#ViewCommunicationEvent"/> - <view-map name="ViewRequest" type="screen" page="component://myportal/widget/MyPageScreens.xml#ViewRequest"/> - <view-map name="EditRequest" type="screen" page="component://myportal/widget/MyPageScreens.xml#EditRequest"/> - <view-map name="ListInvoices" type="screen" page="component://myportal/widget/MyPageScreens.xml#ListInvoices"/> - <view-map name="ListProjects" type="screen" page="component://myportal/widget/MyPageScreens.xml#ListProjects"/> + <view-map name="newEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#newEvent"/> + <view-map name="ViewCommunicationEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ViewCommunicationEvent"/> + <view-map name="ViewRequest" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ViewRequest"/> + <view-map name="EditRequest" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditRequest"/> + <view-map name="ListInvoices" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListInvoices"/> + <view-map name="ListProjects" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListProjects"/> <view-map name="custPreferences" type="screen" page="component://myportal/widget/CommonScreens.xml#custPreferences"/> - <view-map name="EditCommunicationEvent" type="screen" page="component://myportal/widget/MyPageScreens.xml#EditCommunicationEvent"/> - <view-map name="addAttachmentEmail" type="screen" page="component://myportal/widget/MyPageScreens.xml#addAttachmentEmail"/> - <view-map name="EditCustRequestContent" type="screen" page="component://myportal/widget/MyPageScreens.xml#EditCustRequestContent"/> + <view-map name="EditCommunicationEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditCommunicationEvent"/> + <view-map name="addAttachmentEmail" type="screen" page="component://myportal/widget/MyPortalScreens.xml#addAttachmentEmail"/> + <view-map name="EditCustRequestContent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditCustRequestContent"/> </site-conf> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Tue Jan 6 21:25:17 2009 @@ -178,10 +178,10 @@ <not><if-empty field-name="custRequest"/></not> </condition> <widgets> - <include-menu location="component://myportal/widget/MyPageMenus.xml" name="RequestTabBar"/> + <include-menu location="component://myportal/widget/MyPortalMenus.xml" name="RequestTabBar"/> </widgets> </section> - <include-menu name="RequestSubTabBar" location="component://myportal/widget/MyPageMenus.xml"/> + <include-menu name="RequestSubTabBar" location="component://myportal/widget/MyPortalMenus.xml"/> <container> <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] ${custRequest.custRequestName}</label> </container> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Tue Jan 6 21:25:17 2009 @@ -81,7 +81,7 @@ </form> <form name="preferences" type="single" target="updatePreferences" default-map-name="preferences.userPrefMap"> - <field name="userPrefGroupTypeId"><hidden value="MyPage"/></field> + <field name="userPrefGroupTypeId"><hidden value="MyPortal"/></field> <field name="myCommunications"><check/></field> <field name="otherCommunications"><check/></field> <field name="myCompanyComms"><check/></field> @@ -91,7 +91,7 @@ </form> <form name="custPreferences" type="single" target="updateCustPreferences" default-map-name="preferences.userPrefMap"> - <field name="userPrefGroupTypeId"><hidden value="MyPage"/></field> + <field name="userPrefGroupTypeId"><hidden value="MyPortal"/></field> <field name="sendCustRequestEmail" title="${uiLabelMap.SendMailEveryCust}"><check/></field> <field name="updateButton"><submit/></field> </form> @@ -196,7 +196,7 @@ <field-map field-name="compareDate" env-name="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <script location="component://mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy"/> + <script location="component://myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy"/> </row-actions> <field name="invoiceId" widget-style="buttontext"> <hyperlink description="${invoiceId}" target="invoice.pdf?invoiceId=${invoiceId}"/> @@ -231,7 +231,7 @@ </field> </form> - <form name="MyPageNewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent"> + <form name="MyPortalNewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent"> <actions> <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <entity-condition entity-name="PartyContactWithPurpose" list-name="emailAddresses"> @@ -278,10 +278,10 @@ <field name="contentMimeTypeId"><hidden value="text/plain"/></field> <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20" default-value="${parameters.content}"/></field> <field name="send" title="&nbsp;" position="1"> - <hyperlink also-hidden="true" target-type="plain" description="Send" target="javascript:(document.MyPageNewEmail.submit())"/> + <hyperlink also-hidden="true" target-type="plain" description="Send" target="javascript:(document.MyPortalNewEmail.submit())"/> </field> <field name="save" title="&nbsp;" position="2"> - <hyperlink also-hidden="true" target-type="plain" description="Save" target="javascript:(document.MyPageNewEmail.statusId.value='COM_PENDING'),(document.MyPageNewEmail.submit())"/> + <hyperlink also-hidden="true" target-type="plain" description="Save" target="javascript:(document.MyPortalNewEmail.statusId.value='COM_PENDING'),(document.MyPortalNewEmail.submit())"/> </field> <field name="dummy" position="320"><hidden/></field> </form> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Tue Jan 6 21:25:17 2009 @@ -20,124 +20,6 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="MyPageAppBar" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.CommonMyPersonalPage}" menu-container-style="button-bar tab-bar"> - <menu-item name="main" title="${uiLabelMap.CommonMain}"> - <condition> - <not><if-empty field-name="userLogin"/></not> - </condition> - <link target="main?donePage=main"/> - </menu-item> - <menu-item name="viewprofile" title="${uiLabelMap.MyProfile}"> - <condition> - <not><if-empty field-name="userLogin"/></not> - </condition> - <link target="viewprofile?partyId=${userLogin.partyId}"/> - </menu-item> - <menu-item name="myCommunications" title="${uiLabelMap.MyCommunications}"> - <condition> - <and> - <not><if-empty field-name="userLogin"/></not> - <if-compare field-name="preferences.userPrefMap.myCommunications" operator="not-equals" value="Y"/> - </and> - </condition> - <link target="myCommunications?donePage=myCommunications"/> - </menu-item> - <menu-item name="otherCommunications" title="${uiLabelMap.OtherCommunications}"> - <condition> - <and> - <not><if-empty field-name="userLogin"/></not> - <if-compare field-name="preferences.userPrefMap.otherCommunications" operator="not-equals" value="Y"/> - <or> - <if-has-permission permission="MYPAGE_EMPLOYEE"/> - <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/> - </or> - </and> - </condition> - <link target="otherCommunications?donePage=otherCommunications"/> - </menu-item> - <menu-item name="myCompanyComms" title="${uiLabelMap.MyCompanyComms}"> - <condition> - <and> - <not><if-empty field-name="userLogin"/></not> - <if-compare field-name="preferences.userPrefMap.myCompanyComms" operator="not-equals" value="Y"/> - <or> - <if-has-permission permission="MYPAGE_EMPLOYEE"/> - <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/> - </or> - </and> - </condition> - <link target="myCompanyComms"/> - </menu-item> - <menu-item name="myTimesheet" title="${uiLabelMap.myTimesheet}"> - <condition> - <and> - <not><if-empty field-name="userLogin"/></not> - <if-compare field-name="preferences.userPrefMap.myTimesheet" operator="not-equals" value="Y"/> - <or> - <if-has-permission permission="MYPAGE_EMPLOYEE"/> - <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/> - </or> - </and> - </condition> - <link target="myTimesheet?donePage=myTimeSheet"/> - </menu-item> - <menu-item name="myTasks" title="${uiLabelMap.myTasks}"> - <condition> - <and> - <not><if-empty field-name="userLogin"/></not> - <if-compare field-name="preferences.userPrefMap.myTasks" operator="not-equals" value="Y"/> - <or> - <if-has-permission permission="MYPAGE_EMPLOYEE"/> - <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/> - </or> - </and> - </condition> - <link target="myTasks?donePage=myTasks"/> - </menu-item> - <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"> - <condition> - <and> - <not><if-empty field-name="userLogin"/></not> - <if-has-permission permission="MYPAGE_CUSTOMER"/> - </and> - </condition> - <link target="listInvoices"/> - </menu-item> - <menu-item name="projects" title="${uiLabelMap.ProjectMgrProjects}"> - <condition> - <and> - <not><if-empty field-name="userLogin"/></not> - <if-has-permission permission="MYPAGE_CUSTOMER"/> - </and> - </condition> - <link target="listProjects"/> - </menu-item> - <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed"> - <condition><not><if-empty field-name="userLogin"/></not></condition> - <link target="logout"/> - </menu-item> - <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed"> - <condition><if-empty field-name="userLogin"/></condition> - <link target="${checkLoginUrl}"/> - </menu-item> - <menu-item name="help" title="${uiLabelMap.CommonHelp}" align-style="opposed"> - <condition><not><if-empty field-name="userLogin"/></not></condition> - <link target="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable" url-mode="plain" target-window="new"/> - </menu-item> - <menu-item name="preferences" title="${uiLabelMap.CommonPreferences}" align-style="opposed"> - <condition> - <if-has-permission permission="MYPAGE_EMPLOYEE"/> - </condition> - <link target="preferences"/> - </menu-item> - <menu-item name="custPreferences" title="${uiLabelMap.CommonPreferences}" align-style="opposed"> - <condition> - <if-has-permission permission="MYPAGE_CUSTOMER"/> - </condition> - <link target="custPreferences"/> - </menu-item> - </menu> - <menu name="MyCompanyCommsMenu"> <menu-item name="newEvent" title="${uiLabelMap.WorkEffortNewEvent}"> <link target="newEvent?donePage=${parameters.donePage}"/> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=732223&r1=732222&r2=732223&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Tue Jan 6 21:25:17 2009 @@ -34,7 +34,7 @@ <decorator-section name="body"> <screenlet> <include-form name="newEvent" - location="component://mypage/widget/MyPortalForms.xml" /> + location="component://myportal/widget/MyPortalForms.xml" /> </screenlet> </decorator-section> </decorator-screen> @@ -57,7 +57,7 @@ <widgets> <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}" navigation-menu-name="MyTimesheetMenu" collapsible="true" name="timesheet"> - <include-menu name="MyTimesheetMenu" location="component://mypage/widget/MyPageMenus.xml"/> + <include-menu name="MyTimesheetMenu" location="component://myportal/widget/MyPortalMenus.xml"/> <section> <condition> <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> @@ -66,7 +66,7 @@ <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> </widgets> <fail-widgets> - <include-form name="EditWeekTimesheet" location="component://mypage/widget/MyPageForms.xml"/> + <include-form name="EditWeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/> </fail-widgets> </section> </screenlet> @@ -82,7 +82,7 @@ <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> </widgets> <fail-widgets> - <include-form name="EditWeekTimesheet" location="component://mypage/widget/MyPageForms.xml"/> + <include-form name="EditWeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/> </fail-widgets> </section> </screenlet> @@ -505,13 +505,9 @@ </entity-condition> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleListInvoices}" navigation-form-name="ListInvoices"> - <include-form name="ListInvoices" location="component://myportal/widget/MyPortalForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> + <screenlet title="${uiLabelMap.PageTitleListInvoices}" navigation-form-name="ListInvoices"> + <include-form name="ListInvoices" location="component://myportal/widget/MyPortalForms.xml"/> + </screenlet> </widgets> </section> </screen> @@ -559,7 +555,7 @@ </condition> <widgets> <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true"> - <include-form location="component://myportal/widget/MyPortalForms.xml" name="MyPageNewEmail"/> + <include-form location="component://myportal/widget/MyPortalForms.xml" name="MyPortalNewEmail"/> <include-screen name="AttachFiletList"/> </screenlet> </widgets> @@ -670,8 +666,6 @@ </entity-condition> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> <iterate-section entry-name="project" list-name="projects"> <section> <actions> @@ -737,8 +731,6 @@ <label style="h2" text="no projects found"></label> </widgets> </section> - </decorator-section> - </decorator-screen> </widgets> </section> </screen> @@ -775,7 +767,7 @@ <section> <actions> <service service-name="getUserPreferenceGroup" result-map-name="preferences"> - <field-map field-name="userPrefGroupTypeId" value="MyPage"/> + <field-map field-name="userPrefGroupTypeId" value="MyPortal"/> </service> <!-- check if there are any customer requests for this user --> <entity-condition list-name="custRequests" entity-name="CustReqAndTypeAndPartyRel"> @@ -803,6 +795,221 @@ </widgets> </section> </screen> + + <screen name="ListCustRequests"> + <section> + <actions> + <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="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <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="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> + <condition-list combine="or"> + <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> + <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/> + </condition-list> + </condition-list> + <order-by field-name="custRequestDate"/> + </entity-condition> + <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> + <entity-condition list-name="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> + <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> + </condition-list> + <order-by field-name="custRequestDate"/> + </entity-condition> + <!-- 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"> + <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> + <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> + <condition-list combine="or"> + <condition-expr field-name="roleStatusId" + operator="not-equals" value="COM_ROLE_COMPLETED" /> + <condition-expr field-name="roleStatusId" + operator="like" value="${status}" /> + </condition-list> + </condition-list> + <order-by field-name="-datetimeStarted" /> + </entity-condition> + </actions> + <widgets> + <section> + <widgets> + <screenlet title="${uiLabelMap.MyOpenCustomerRequests}" navigation-form-name="ListCustRequests" > + <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> + <include-form name="ListCustRequests" location="component://myportal/widget/MyPortalForms.xml"/> + </screenlet> + </widgets> + </section> + </widgets> + </section> + </screen> + + <screen name="ListCustRequestsCompleted"> + <section> + <actions> + <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="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <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="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> + <condition-list combine="or"> + <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> + <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/> + </condition-list> + </condition-list> + <order-by field-name="custRequestDate"/> + </entity-condition> + <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> + <entity-condition list-name="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> + <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> + </condition-list> + <order-by field-name="custRequestDate"/> + </entity-condition> + <!-- 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"> + <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> + <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> + <condition-list combine="or"> + <condition-expr field-name="roleStatusId" + operator="not-equals" value="COM_ROLE_COMPLETED" /> + <condition-expr field-name="roleStatusId" + operator="like" value="${status}" /> + </condition-list> + </condition-list> + <order-by field-name="-datetimeStarted" /> + </entity-condition> + </actions> + <widgets> + <section> + <widgets> + <screenlet title="${uiLabelMap.MyCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted"> + <include-form name="ListCustRequestsCompleted" location="component://myportal/widget/MyPortalForms.xml"/> + </screenlet> + </widgets> + </section> + </widgets> + </section> + </screen> + + <screen name="ListPartyCommEvents"> + <section> + <actions> + <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="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <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="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/> + <condition-list combine="or"> + <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> + <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/> + </condition-list> + </condition-list> + <order-by field-name="custRequestDate"/> + </entity-condition> + <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> + <entity-condition list-name="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel"> + <condition-list combine="and"> + <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/> + <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/> + </condition-list> + <order-by field-name="custRequestDate"/> + </entity-condition> + <!-- 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"> + <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" /> + <condition-expr field-name="partyId" operator="equals" value="${partyId}" /> + <condition-list combine="or"> + <condition-expr field-name="roleStatusId" + operator="not-equals" value="COM_ROLE_COMPLETED" /> + <condition-expr field-name="roleStatusId" + operator="like" value="${status}" /> + </condition-list> + </condition-list> + <order-by field-name="-datetimeStarted" /> + </entity-condition> + </actions> + <widgets> + <section> + <widgets> + <screenlet title="${uiLabelMap.OtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests"> + <include-form name="ListOtherCompanyRequests" location="component://myportal/widget/MyPortalForms.xml"/> + </screenlet> + </widgets> + </section> + <section> + <widgets> + <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] " + navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents" name="myComms"> + <include-menu name="communicationsMenu" location="component://myportal/widget/MyPortalMenus.xml" /> + <include-form name="ListPartyCommEvents" location="component://myportal/widget/MyPortalForms.xml" /> + </screenlet> + </widgets> + </section> + </widgets> + </section> + </screen> + + <screen name="ContentList"> + <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> + <entity-and entity-name="PartyContent" list-name="partyContent"> + <field-map field-name="partyId" env-name="parameters.partyId"/> + </entity-and> + </actions> + <widgets> + <platform-specific> + <html> + <html-template location="component://party/webapp/partymgr/party/profileblocks/ContentList.ftl"/> + </html> + </platform-specific> + </widgets> + </section> + </screen> <!-- My Profile Screens --> <screen name="Party"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |