svn commit: r743000 - in /ofbiz/trunk: framework/common/script/org/ofbiz/common/ framework/common/servicedef/ framework/common/webcommon/WEB-INF/ framework/common/webcommon/WEB-INF/actions/includes/ framework/common/webcommon/portal/ framework/common/w...

[hansbak-2]

Author: hansbak
Date: Tue Feb 10 15:48:08 2009
New Revision: 743000

URL: http://svn.apache.org/viewvc?rev=743000&view=rev
Log:
update/display portlet sequence corrected, also seed data corrected

Modified:
    ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
    ofbiz/trunk/framework/common/servicedef/services.xml
    ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy
    ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
    ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
    ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=743000&r1=742999&r2=743000&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Feb 10 15:48:08 2009
@@ -142,5 +142,54 @@
             <check-errors/>
         </if-not-empty>
     </simple-method>
+    <simple-method method-name="updatePortalPagePortletSeq" short-description="Update the portal page sequence numbers">
+        <call-simple-method method-name="checkOwnerShip"/>
+        <entity-one entity-name="PortalPagePortlet" value-field="portalPagePortlet"/>
+        <if-compare field="parameters.mode" value="UP" operator="equals">
+            <set field="portalPagePortlet.sequenceNum" value="${portalPagePortlet.sequenceNum - 1}" type="Long"/>
+        </if-compare>
+        <if-compare field="parameters.mode" value="DOWN" operator="equals">
+            <set field="portalPagePortlet.sequenceNum" value="${portalPagePortlet.sequenceNum + 1}" type="Long"/>
+        </if-compare>
+        <if-compare field="parameters.mode" value="TOP" operator="equals">
+            <set field="portalPagePortlet.sequenceNum" value="0" type="Long"/>
+        </if-compare>
+        <if-compare field="parameters.mode" value="BOTTOM" operator="equals">
+            <entity-and entity-name="PortalPagePortlet" list="ppList">
+                <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
+                <order-by field-name="-sequenceNum"/>
+            </entity-and>
+            <first-from-list entry="ppEntry" list="ppList"/>
+            <set field="portalPagePortlet.sequenceNum" value="${ppEntry.sequenceNum + 1}" type="Long"/>
+        </if-compare>
+        <!-- update conflicting entries -->
+        <if-compare field="parameters.mode" value="BOTTOM" operator="not-equals">
+            <if-compare field="parameters.mode" value="DOWN" operator="equals">
+                <entity-and entity-name="PortalPagePortlet" list="ppList">
+                    <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
+                    <field-map field-name="sequenceNum" from-field="portalPagePortlet.sequenceNum"/>
+                    <order-by field-name="+sequenceNum"/>
+                </entity-and>
+                <if-not-empty field="ppList">
+                    <first-from-list entry="ppEntry" list="ppList"/>
+                    <set field="ppEntry.sequenceNum" value="${portalPagePortlet.sequenceNum - 1}" type="Long"/>
+                    <store-value value-field="ppEntry"/>
+                </if-not-empty>
+                <else>
+                    <entity-and entity-name="PortalPagePortlet" list="ppList">
+                        <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
+                        <field-map field-name="sequenceNum" from-field="portalPagePortlet.sequenceNum"/>
+                        <order-by field-name="-sequenceNum"/>
+                    </entity-and>
+                    <if-not-empty field="ppList">
+                        <first-from-list entry="ppEntry" list="ppList"/>
+                        <set field="ppEntry.sequenceNum" value="${portalPagePortlet.sequenceNum + 1}" type="Long"/>
+                        <store-value value-field="ppEntry"/>
+                    </if-not-empty>
+                </else>
+            </if-compare>
+        </if-compare>
+        <store-value value-field="portalPagePortlet"/>
+    </simple-method>
 
 </simple-methods>

Modified: ofbiz/trunk/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=743000&r1=742999&r2=743000&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services.xml Tue Feb 10 15:48:08 2009
@@ -624,6 +624,11 @@
         <description>Delete a Portal Page, related colums and used portlets</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
+    <service name="updatePortalPagePortletSeq" engine="simple" default-entity-name="PortalPagePortlet" auth="true"
+        location="org/ofbiz/common/PortalPageServices.xml" invoke="updatePortalPagePortletSeq">
+        <auto-attributes mode="IN" include="pk"/>
+        <attribute name="mode" type="String" mode="IN"/><!-- possible values: TOP, BOTTOM, UP, DOWN -->
+    </service>
 
     <!-- PortalPageColumn services -->
     <service name="addPortalPageColumn" default-entity-name="PortalPageColumn" engine="simple" auth="true"

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy?rev=743000&r1=742999&r2=743000&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy Tue Feb 10 15:48:08 2009
@@ -71,5 +71,5 @@
     parameters.portalPageId = portalPage.portalPageId;
     context.portalPage = portalPage;
     context.portalPageColumns = portalPage.getRelated("PortalPageColumn");
-    context.portalPagePortlets = delegator.findByAnd("PortalPagePortletView", [portalPageId : portalPage.portalPageId]);
-}
\ No newline at end of file
+    context.portalPagePortlets = delegator.findByAnd("PortalPagePortletView", [portalPageId : portalPage.portalPageId], ["columnSeqId", "sequenceNum"]);
+}

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=743000&r1=742999&r2=743000&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Tue Feb 10 15:48:08 2009
@@ -53,6 +53,12 @@
         <response name="success" type="request" value="ManagePortalPages"/>
         <response name="error" type="request" value="ManagePortalPages"/>
     </request-map>
+    <request-map uri="updatePortalPagePortletSeq">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updatePortalPagePortletSeq"/>
+        <response name="success" type="request" value="ManagePortalPages"/>
+        <response name="error" type="request" value="ManagePortalPages"/>
+    </request-map>
     <request-map uri="deletePortalPagePortlet">
         <security https="true" auth="true"/>
         <event type="service" invoke="deletePortalPagePortlet"/>

Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=743000&r1=742999&r2=743000&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Tue Feb 10 15:48:08 2009
@@ -66,10 +66,10 @@
                   </#if>  
 
                   <#if portlet_has_next> <#-- TODO: this doesn't take into account that later items in the list might be in a different column -->
-                    <li class="move-down"><a href="<@ofbizUrl>updatePortalPagePortlet?${portletUrlLink}&amp;sequenceNum=${portlet.sequenceNum?default(0) + 1}</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletDown}">&nbsp;&nbsp;&nbsp;</a></li>
+                    <li class="move-down"><a href="<@ofbizUrl>updatePortalPagePortletSeq?${portletUrlLink}&amp;mode=DOWN</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletDown}">&nbsp;&nbsp;&nbsp;</a></li>
                   </#if>  
                   <#if !firstInColumn>
-                    <li class="move-up"><a href="<@ofbizUrl>updatePortalPagePortlet?${portletUrlLink}&amp;sequenceNum=${portlet.sequenceNum?default(1)-1}</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletUp}">&nbsp;&nbsp;&nbsp;</a></li>
+                    <li class="move-up"><a href="<@ofbizUrl>updatePortalPagePortletSeq?${portletUrlLink}&amp;mode=UP</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletUp}">&nbsp;&nbsp;&nbsp;</a></li>
                   </#if>  
                   <#if portalPageColumn_has_next>
                     <li class="move-right"><a href="<@ofbizUrl>updatePortalPagePortlet?${portletUrlLink}&amp;columnSeqId=${portalPageColumnList[portalPageColumn_index+1].columnSeqId}</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletRight}">&nbsp;&nbsp;&nbsp;</a></li>
@@ -78,10 +78,10 @@
                     <li class="move-left"><a href="<@ofbizUrl>updatePortalPagePortlet?${portletUrlLink}&amp;columnSeqId=${portalPageColumnList[portalPageColumn_index-1].columnSeqId}</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletLeft}">&nbsp;&nbsp;&nbsp;</a></li>
                   </#if>  
                   <#if !firstInColumn>
-                    <li class="move-top"><a href="<@ofbizUrl>updatePortalPagePortlet?${portletUrlLink}&amp;sequenceNum=0</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletTop}">&nbsp;&nbsp;&nbsp;</a></li>
+                    <li class="move-top"><a href="<@ofbizUrl>updatePortalPagePortletSeq?${portletUrlLink}&amp;mode=TOP</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletTop}">&nbsp;&nbsp;&nbsp;</a></li>
                   </#if>  
                   <#if portlet_has_next> <#-- TODO: this doesn't take into account that later items in the list might be in a different column -->
-                    <li class="move-bottom"><a href="<@ofbizUrl>updatePortalPagePortlet?${portletUrlLink}&amp;sequenceNum=${portalPagePortletViewList.size()}</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletBottom}">&nbsp;&nbsp;&nbsp;</a></li>
+                    <li class="move-bottom"><a href="<@ofbizUrl>updatePortalPagePortletSeq?${portletUrlLink}&amp;mode=BOTTOM</@ofbizUrl>" title="${uiLabelMap.CommonMovePortletBottom}">&nbsp;&nbsp;&nbsp;</a></li>
                   </#if>  
                   <#if (portalPages.size() > 1)>
                     <li>

Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=743000&r1=742999&r2=743000&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Tue Feb 10 15:48:08 2009
@@ -59,12 +59,13 @@
                             <actions>
                                 <set field="portalPages[]" from-field="portalPage"/>    
                                 <entity-condition entity-name="PortalPageColumn" list="portalPageColumnList">
-                                    <condition-expr field-name="portalPageId" from-field="portalPage.portalPageId"/>
+                                    <condition-expr field-name="portalPageId" from-field="parameters.portalPageId"/>
                                     <order-by field-name="columnSeqId"/>
                                 </entity-condition>              
                                 <entity-condition entity-name="PortalPagePortletView" list="portalPagePortletViewList">
-                                    <condition-expr field-name="portalPageId" from-field="portalPage.portalPageId"/>
-                                    <order-by field-name="sequenceNum"/>
+                                    <condition-expr field-name="portalPageId" from-field="parameters.portalPageId"/>
+                                    <order-by field-name="+columnSeqId"/>
+                                    <order-by field-name="+sequenceNum"/>
                                 </entity-condition>
                             </actions>
                             <widgets>

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=743000&r1=742999&r2=743000&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Feb 10 15:48:08 2009
@@ -101,60 +101,53 @@
     
     <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
     
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" />    
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="listrequestlist" 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"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="3" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="6"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="7"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" sequenceNum="9"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" sequenceNum="11"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+    <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" />    
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML2" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="listrequestlist" 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"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002"  sequenceNum="2"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="3"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002"  sequenceNum="4"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002"  sequenceNum="5"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002"  sequenceNum="6"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002"  sequenceNum="7"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML2" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001"  sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML3" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001"  sequenceNum="0"/>
+    <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"/>
     
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequestsComp" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListPartyCommEvents" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="0" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" />
-    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequestsComp" portletSeqId="00001" columnSeqId="00001"  sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListPartyCommEvents" portletSeqId="00001" columnSeqId="00001"  sequenceNum="1"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001"  sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001"  sequenceNum="1"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001"  sequenceNum="2"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="3" />
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002"  sequenceNum="4"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002"  sequenceNum="5"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002"  sequenceNum="6"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002"  sequenceNum="7"/>
+    <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"/>
     
 </entity-engine-xml>
\ No newline at end of file