Author: hansbak
Date: Sun Mar 15 02:56:28 2009
New Revision: 754604
URL: http://svn.apache.org/viewvc?rev=754604&view=rev
Log:
move communications for a specific party back to the party component. Make use
of the portlet attributes to use both for userlogin and company comms
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/data/PartyPortletData.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageMethods.xml
ofbiz/trunk/framework/common/widget/PortletEditForms.xml
ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.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/applications/party/config/PartyUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Mar 15 02:56:28
2009
@@ -2379,6 +2379,12 @@
<value
xml:lang="th">à¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value>
<value xml:lang="zh">å
¨é¨æ²éäºä»¶</value>
</property>
+ <property key="PartyAllEvents">
+ <value xml:lang="en">All Communications</value>
+ <value xml:lang="fr">Toutes les communications</value>
+ <value xml:lang="it">Tutte le comunicazioni</value>
+ <value
xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value>
+ </property>
<property key="PartyAllPhoneNumbers">
<value xml:lang="cs">VÅ¡echna telefonnà ÄÃsla</value>
<value xml:lang="de">Alle Telefonnummern</value>
@@ -3070,6 +3076,12 @@
<value
xml:lang="th">วิà¸à¸µà¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸·à¹à¸à¸ªà¸²à¸£</value>
<value xml:lang="zh">æ²é</value>
</property>
+ <property key="PartyCommunicationsOfParty">
+ <value xml:lang="en">Communications of party</value>
+ <value xml:lang="fr">Communications de l'acteur</value>
+ <value xml:lang="it">Comunicazioni del soggetto</value>
+ <value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸¸à¸à¸à¸¥</value>
+ </property>
<property key="PartyCommunicationsWith">
<value xml:lang="de">Kommunikationen mit</value>
<value xml:lang="en">Communications with</value>
@@ -4247,6 +4259,18 @@
<value xml:lang="th">à¸à¸µà¹à¸à¸¢à¸¹à¹à¸à¸µà¹à¸¡à¸¥</value>
<value xml:lang="zh">çµåé®ä»¶å°å</value>
</property>
+ <property key="PartyEmailsFromKnownOrigin">
+ <value xml:lang="en">Emails from known origin</value>
+ <value xml:lang="fr">Courriel issue d'une origine connue</value>
+ <value xml:lang="it">Emails da origine sconosciuta</value>
+ <value
xml:lang="th">à¸à¸µà¹à¸¡à¸¥à¹à¸à¸µà¹à¸à¹à¸²à¸à¹à¸¥à¹à¸§</value>
+ </property>
+ <property key="PartyEmailsFromUnknownOrigin">
+ <value xml:lang="en">Emails from UN-known origin</value>
+ <value xml:lang="fr">Courriel issue d'une origine inconnue</value>
+ <value xml:lang="it">Emails da origini conosciuta</value>
+ <value
xml:lang="th">à¸à¸µà¹à¸¡à¸¥à¹à¸à¸µà¹à¹à¸¡à¹à¸£à¸°à¸à¸¸</value>
+ </property>
<property key="PartyEmailAddressMissing">
<value xml:lang="de">E-Mail Adresse fehlt</value>
<value xml:lang="en">Email Address is missing</value>
@@ -5714,6 +5738,10 @@
<value
xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¹à¸¡à¹à¹à¸à¹à¸à¸à¸à¸à¸¸à¸,
à¸à¸¸à¸à¹à¸¡à¹à¸à¸²à¸à¸à¸°à¸à¸¹à¸«à¸£à¸·à¸à¹à¸à¹à¹à¸à¸¡à¸±à¸à¹à¸à¹</value>
<value
xml:lang="zh">æå®çè系信æ¯ä¸å±äºä½ ï¼ä½ ä¸è½æµè§æç¼è¾å®ã</value>
</property>
+ <property key="PartyDraftEmails">
+ <value xml:lang="en">Draft Emails</value>
+ <value xml:lang="it">Bozze emails</value>
+ </property>
<property key="PartyName">
<value xml:lang="cs">Jméno</value>
<value xml:lang="de">Name</value>
@@ -6369,6 +6397,12 @@
<value xml:lang="th">รหัสà¸à¹à¸²à¸à¹à¸à¸´à¸¡</value>
<value xml:lang="zh">å½åå¯ç </value>
</property>
+ <property key="PartyOpenEvents">
+ <value xml:lang="en">Open Communications</value>
+ <value xml:lang="fr">Communications ouvertes</value>
+ <value xml:lang="it">Comunicazioni aperte</value>
+ <value xml:lang="th">à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value>
+ </property>
<property key="PartyOptional">
<value xml:lang="de">Optional</value>
<value xml:lang="en">Optional</value>
@@ -8437,6 +8471,12 @@
<value xml:lang="th">à¸à¸¶à¸à¸à¸±à¸à¸£</value>
<value xml:lang="zh">å°è´ç©è½¦</value>
</property>
+ <property key="PartyToComplete">
+ <value xml:lang="en">->Closed</value>
+ <value xml:lang="fr">->Fermé(e)</value>
+ <value xml:lang="it">->Chiuso</value>
+ <value xml:lang="th">à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸</value>
+ </property>
<property key="PartyToContactMech">
<value xml:lang="de">Zum Kontaktmechanismus</value>
<value xml:lang="en">To Contact Mech</value>
Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Sun Mar 15
02:56:28 2009
@@ -23,7 +23,9 @@
<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="communicationList"
portletName="Communications" screenName="Communications"
screenLocation="component://party/widget/partymgr/CommunicationScreens.xml"
description="My Communications From My Page"
securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
+ <PortalPortlet portalPortletId="communications"
portletName="Communications" description="Communication list"
+ screenName="Communications"
screenLocation="component://party/widget/partymgr/CommunicationScreens.xml"
+ editFormName="EditPartyId"
editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml"
/>
</entity-engine-xml>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
Sun Mar 15 02:56:28 2009
@@ -690,4 +690,67 @@
<form name="ListRequests" extends="ListRequests"
extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
<field name="custRequestName"><hyperlink
description="${custRequestName} [${custRequestId}]"
target="/ordermgr/control/ViewRequest?custRequestId=${custRequestId}"
target-type="inter-app"/></field>
</form>
+
+ <form name="ListMyUnknownPartyEmails" type="multi"
+ extends="ListMyUnknownPartyEmails"
extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
use-row-submit="true">
+ <field name="portalPageId"><hidden/></field>
+ <field name="subject" widget-style="buttontext"
widget-area-style="fieldWidth300">
+ <hyperlink description="${subject}"
target="deleteCommunicationEvents?portalPageId=${parameters.portalPageId}"/>
+ </field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
+ <check />
+ </field>
+ <field name="deleteSelectedButton" widget-style="smallSubmit">
+ <submit />
+ </field>
+ </form>
+
+ <form name="EditPartyId" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml">
+ <field name="communicationPartyId"
entry-name="attributeMap.communicationPartyId">
+ <lookup target-form-name="LookupPartyName"/>
+ </field>
+ <field name="updateButton"><submit/></field>
+ </form>
+
+ <form name="ListPartyCommEvents" extends="ListCommEvents"
extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
type="list">
+ <row-actions>
+ <set field="toComplete"
value="${bsh:"COM_ROLE_READ".equals(roleStatusId)?"toComplete":""}"/>
+ </row-actions>
+ <field name="portalPageId"><hidden/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"
description="${description}"/></field>
+ <field name="removeLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="smallSubmit">
+ <hyperlink also-hidden="false"
description="${uiLabelMap.CommonDelete}"
target="RemoveCommunicationEventRole?partyId=${partyId}&communicationEventId=${communicationEventId}&roleTypeId=${roleTypeId}&deleteCommEventIfLast=Y&delContentDataResource=Y&portalPageId=${parameters.portalPageId}"/>
+ </field>
+ <field name="subject" widget-style="buttontext"
widget-area-style="fieldWidth300">
+ <hyperlink description="${subject} "
target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&partyId=${partyId}&roleTypeId=${roleTypeId}&portalPageId=${portalPageId}"/>
+ </field>
+ <field name="statusId" entry-name="roleStatusId"
widget-style="buttontext" widget-area-style="fieldWidth300">
+ <display-entity entity-name="StatusItem"
description="${description}">
+ <sub-hyperlink description="${uiLabelMap.PartyToComplete}"
target="setCommunicationEventRoleStatus?communicationEventId=${communicationEventId}&partyId=${partyId}&roleTypeId=${roleTypeId}&statusId=COM_ROLE_COMPLETED&donePage=${parameters.donePage}&VIEW_SIZE=${parameters.VIEWSIZE}&VIEW_INDEX=${parameters.VIEW_INDEX}"/>
+ </display-entity>
+ </field>
+ <field name="createdStamp" entry-name="entryDate"/>
+ </form>
+
+ <form name="ListDraftEmails" type="list" extends="ListCommEvents"
extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
+ use-row-submit="true">
+ <actions>
+ <entity-condition entity-name="CommunicationEvent"
list="commEvents">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId" operator="equals"
value="COM_PENDING"/>
+ <condition-expr field-name="partyIdFrom" operator="equals"
value="${partyId}"/>
+ </condition-list>
+ <order-by field-name="-lastUpdatedStamp"/>
+ </entity-condition>
+ </actions>
+ <field name="subject">
+ <hyperlink description="${subject}"
target="EditCommunicationEvent?communicationEventId=${communicationEventId}&communicationEventTypeId=EMAIL_COMMUNICATION&partyId=${userLogin.partyId}"/>
+ </field>
+ <field name="removeLink" title="${uiLabelMap.CommonDelete}"
widget-style="smallSubmit">
+ <hyperlink also-hidden="false"
description="${uiLabelMap.CommonDelete}"
target="deletePartyCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}&portalPageId=${portalPageId}"/>
+ </field>
+ </form>
+
+
+
</forms>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sun
Mar 15 02:56:28 2009
@@ -72,8 +72,6 @@
<set field="partyIdFrom" value="${parameters.partyIdFrom}"
default-value="${parameters.partyId}"/>
<set field="partyIdTo" value="${parameters.partyIdTo}"
default-value="${parameters.partyId}"/>
<set field="donePage" from-field="parameters.DONE_PAGE"
default-value="ListPartyCommEvents?partyId=${partyId}"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer" default-value="0"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="20"/>
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -677,4 +675,91 @@
</widgets>
</section>
</screen>
+
+ <!-- Portlet screens -->
+ <screen name="Communications">
+ <section>
+ <actions>
+ <script
location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
+ <set field="partyId" from-field="parameters.partyId"
default-value="${communicationPartyId}"/>
+ <set field="partyId" from-field="partyId"
default-value="${userLogin.partyId}"/>
+ <set field="all" from-field="parameters.all"/>
+ <entity-condition entity-name="CommunicationEventAndRole"
+ list="commEvents">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId"
operator="not-equals"
+ value="COM_UNKNOWN_PARTY" />
+ <condition-expr field-name="statusId"
operator="not-equals"
+ value="COM_PENDING" />
+ <condition-expr field-name="partyId" operator="equals"
+ value="${partyId}" />
+ <condition-expr field-name="roleStatusId"
+ operator="not-equals" value="COM_ROLE_COMPLETED"
ignore="${all}" />
+ </condition-list>
+ <order-by field-name="-datetimeStarted" />
+ </entity-condition>
+ <entity-condition entity-name="CommunicationEventAndRole"
+ list="commEventsUnknown">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId" operator="equals"
+ value="COM_UNKNOWN_PARTY" />
+ <condition-expr field-name="roleStatusId"
operator="not-equals"
+ value="COM_ROLE_COMPLETED" />
+ <condition-expr field-name="partyId" operator="equals"
+ value="${partyId}" />
+ </condition-list>
+ <order-by field-name="-datetimeStarted" />
+ </entity-condition>
+ <entity-condition entity-name="CommunicationEventAndRole"
list="commEventDraft">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId"
operator="equals"
+ value="COM_PENDING"/>
+ <condition-expr field-name="partyId" operator="equals"
+ value="${partyId}"/>
+ </condition-list>
+ <order-by field-name="-datetimeStarted" />
+ </entity-condition>
+ <entity-one entity-name="PartyNameView"
value-field="partyName">
+ <field-map field-name="partyId" from-field="partyId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.PartyCommunicationsOfParty}:
${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://party/widget/partymgr/PartyMenus.xml" />
+ <section>
+ <condition>
+ <not>
+ <if-empty field="commEventsUnknown" />
+ </not>
+ </condition>
+ <widgets>
+ <label style="h2"
text="${uiLabelMap.PartyEmailsFromUnknownOrigin}"></label>
+ <include-form
+
location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ListMyUnknownPartyEmails" />
+ </widgets>
+ </section>
+ <label style="h2"
text="${uiLabelMap.PartyEmailsFromKnownOrigin}"></label>
+ <include-form name="ListPartyCommEvents"
+
location="component://party/webapp/partymgr/communication/CommForms.xml"/>
+ <section>
+ <condition>
+ <not>
+ <if-empty field="commEventDraft" />
+ </not>
+ </condition>
+ <widgets>
+ <label style="h2"
text="${uiLabelMap.PartyDraftEmails}"></label>
+ <include-form
+
location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ListDraftEmails" />
+ </widgets>
+ </section>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Mar 15
02:56:28 2009
@@ -175,7 +175,7 @@
<menu name="personUpdate">
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
- <link target="editperson?partyId=${party.partyId}"/>
+ <link target="editperson?partyId=${parameters.partyId}"/>
</menu-item>
</menu>
@@ -193,5 +193,36 @@
<link target="editCarrierAccount?partyId=${party.partyId}"/>
</menu-item>
</menu>
+ <menu name="communicationsMenu">
+ <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
+ <condition>
+ <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
+ </condition>
+ <link
+
target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&portalPageId=${parameters.portalPageId}&statusId=COM_PENDING"/>
+ </menu-item>
+ <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}">
+ <condition>
+ <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
+ </condition>
+ <link
+
target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&portalPageId=${parameters.portalPageId}"
/>
+ </menu-item>
+ <menu-item name="openEvents" title="${uiLabelMap.PartyOpenEvents}">
+ <condition>
+ <if-compare field="parameters.all" operator="equals"
value="true" />
+ </condition>
+ <link
target="showPortalPage?portalPageId=${parameters.portalPageId}&all=false" />
+ </menu-item>
+ <menu-item name="allOtherEvents" title="${uiLabelMap.PartyAllEvents}">
+ <condition>
+ <or>
+ <if-compare field="parameters.all" operator="equals"
value="false" />
+ <if-empty field="parameters.all"/>
+ </or>
+ </condition>
+ <link
target="showPortalPage?portalPageId=${parameters.portalPageId}&all=true" />
+ </menu-item>
+ </menu>
</menus>
Modified:
ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageMethods.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageMethods.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageMethods.xml
(original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageMethods.xml
Sun Mar 15 02:56:28 2009
@@ -100,6 +100,16 @@
<set-service-fields service-name="createPortalPagePortlet"
map="portalPagePortlet" to-map="createPortLet"/>
<set field="createPortLet.portalPageId"
from-field="portalPageId" />
<call-service service-name="createPortalPagePortlet"
in-map-name="createPortLet"/>
+ <!-- copy the attributes -->
+ <entity-and entity-name="PortletAttribute"
list="portletAttributes">
+ <field-map field-name="portalPageId"
from-field="parameters.portalPageId"/>
+ <field-map field-name="portalPortletId"
from-field="portalPagePortlet.portalPortletId"/>
+ <field-map field-name="portletSeqId"
from-field="portalPagePortlet.portletSeqId"/>
+ </entity-and>
+ <iterate entry="portletAttribute" list="portletAttributes">
+ <set field="portletAttribute.portalPageId"
from-field="portalPageId"/>
+ <create-value value-field="portletAttribute"/>
+ </iterate>
</iterate>
<!-- delete the columns -->
Modified: ofbiz/trunk/framework/common/widget/PortletEditForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortletEditForms.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortletEditForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortletEditForms.xml Sun Mar 15
02:56:28 2009
@@ -33,22 +33,5 @@
<field name="portalPortletId"><hidden/></field>
<field name="portletSeqId"><hidden/></field>
</form>
-
- <form name="LoginPortletEdit" extends="CommonPortletEdit">
- <field name="ItemsToShow" entry-name="attributeMap.ItemsToShow">
- <drop-down allow-empty="false">
- <option key="5"/>
- <option key="15"/>
- <option key="20"/>
- <option key="25"/>
- <option key="30"/>
- <option key="35"/>
- </drop-down>
- </field>
-
- <field name="SpecificTitle" entry-name="attributeMap.SpecificTitle">
- <text/>
- </field>
- </form>
</forms>
Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Sun Mar 15
02:56:28 2009
@@ -34,12 +34,6 @@
<value xml:lang="fr">Votre nom est absent</value>
<value
xml:lang="th">à¸à¸£à¸¸à¸à¸²à¸à¸£à¸à¸à¸à¸²à¸¡à¸ªà¸à¸¸à¸¥à¸à¸à¸à¸à¹à¸²à¸</value>
</property>
- <property key="MyPortalAllEvents">
- <value xml:lang="en">All Communications</value>
- <value xml:lang="fr">Toutes les communications</value>
- <value xml:lang="it">Tutte le comunicazioni</value>
- <value
xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value>
- </property>
<property key="MyPortalAppBar">
<value xml:lang="en">My Page App Bar</value>
<value xml:lang="fr">Menu des applications</value>
@@ -58,12 +52,6 @@
<value xml:lang="it">Proprie comunicazioni</value>
<value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸±à¸</value>
</property>
- <property key="MyPortalCommunicationsOfParty">
- <value xml:lang="en">Communications of party</value>
- <value xml:lang="fr">Communications de l'acteur</value>
- <value xml:lang="it">Comunicazioni del soggetto</value>
- <value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸¸à¸à¸à¸¥</value>
- </property>
<property key="MyPortalCompanyComms">
<value xml:lang="en">Company communications</value>
<value xml:lang="fr">Communications de l'entreprise</value>
@@ -94,18 +82,6 @@
<value xml:lang="it">Mio portale</value>
<value xml:lang="th">สà¹à¸§à¸à¸à¸±à¸§</value>
</property>
- <property key="MyPortalEmailsFromKnownOrigin">
- <value xml:lang="en">Emails from known origin</value>
- <value xml:lang="fr">Courriel issue d'une origine connue</value>
- <value xml:lang="it">Emails da origine sconosciuta</value>
- <value
xml:lang="th">à¸à¸µà¹à¸¡à¸¥à¹à¸à¸µà¹à¸à¹à¸²à¸à¹à¸¥à¹à¸§</value>
- </property>
- <property key="MyPortalEmailsFromUnknownOrigin">
- <value xml:lang="en">Emails from known origin</value>
- <value xml:lang="fr">Courriel issue d'une origine inconnue</value>
- <value xml:lang="it">Emails da origini conosciuta</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>
@@ -170,12 +146,6 @@
<value xml:lang="it">Proprie richieste clienti aperte</value>
<value
xml:lang="th">à¸à¸§à¸²à¸¡à¸à¹à¸à¸à¸à¸²à¸£à¸à¸à¸à¸¥à¸¹à¸à¸à¹à¸²</value>
</property>
- <property key="MyPortalOpenEvents">
- <value xml:lang="en">Open Communications</value>
- <value xml:lang="fr">Communications ouvertes</value>
- <value xml:lang="it">Comunicazioni aperte</value>
- <value xml:lang="th">à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value>
- </property>
<property key="MyPortalOtherCommunications">
<value xml:lang="en">Other Communications</value>
<value xml:lang="fr">Autres communications</value>
@@ -252,12 +222,6 @@
<value xml:lang="it">Proprie timbrature</value>
<value
xml:lang="th">à¸à¸²à¸£à¸²à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸à¸à¸à¸±à¸</value>
</property>
- <property key="MyPortalToComplete">
- <value xml:lang="en">->Closed</value>
- <value xml:lang="fr">->Fermé(e)</value>
- <value xml:lang="it">->Chiuso</value>
- <value xml:lang="th">à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸</value>
- </property>
<property key="NewRegistration">
<value xml:lang="en">New Registration </value>
<value xml:lang="fr">Nouvel enregistrement</value>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Sun Mar 15
02:56:28 2009
@@ -32,14 +32,14 @@
<PortalPage portalPageId="MYPORTAL_EMPLOYEE" sequenceNum="0"
portalPageName="Main" description="The OFBiz My Portal Main page"
ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE" />
<PortalPage portalPageId="MYPORTAL_EMPLOYEE1" sequenceNum="100"
portalPageName="My Profile" description="The OFBiz My Portal Profile page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="200"
portalPageName="Other Communications" description="The OFBiz My Portal other
commmunication page" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="200"
portalPageName="Other Party Comms" description="The OFBiz My Portal other
commmunication page" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="300"
portalPageName="Company Events" description="The OFBiz My Portal Company Events
page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="400"
portalPageName="My Time Sheets" description="The OFBiz My Portal Timesheet
page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="500"
portalPageName="My Tasks" description="The OFBiz My Portal My Task page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="0"
portalPageName="Main" description="The default OFBiz portal page"
ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML" />
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML1" sequenceNum="100"
portalPageName="My Profile" description="The OFBiz My Portal Profile page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
- <PortalPage portalPageId="MYPORTAL_EMPL-NOEML2" sequenceNum="200"
portalPageName="Other Communications" description="The OFBiz My Portal other
commmunication page" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+ <PortalPage portalPageId="MYPORTAL_EMPL-NOEML2" sequenceNum="200"
portalPageName="Other Party Comms" description="The OFBiz My Portal other
commmunication page" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML3" sequenceNum="300"
portalPageName="Company Events" description="The OFBiz My Portal Company Events
page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML4" sequenceNum="400"
portalPageName="My Time Sheets" description="The OFBiz My Portal Timesheet
page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML5" sequenceNum="500"
portalPageName="My Tasks" description="The OFBiz My Portal My Task page"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
@@ -91,9 +91,7 @@
<PortalPortlet portalPortletId="UserLogin" portletName="User Login"
screenName="UserLogin"
screenLocation="component://myportal/widget/MyPortalScreens.xml"
description="User Login 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="mycommunications" portletName="My
Communications" screenName="MyCommunications"
screenLocation="component://myportal/widget/MyPortalScreens.xml"
description="My Communications From My Page"
securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
<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="otherCommunications" portletName="Other
Communications" screenName="OtherCommunications"
screenLocation="component://myportal/widget/MyPortalScreens.xml"
description="Other Communications 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" />
@@ -106,7 +104,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="mycommunications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE"
portalPortletId="communications" 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"/>
@@ -119,13 +117,14 @@
<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_EMPLOYEE2"
portalPortletId="communications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
+ <PortletAttribute portalPageId="MYPORTAL_EMPLOYEE2"
portalPortletId="communications" portletSeqId="00001"
attrName="communicationPartyId" attrValue="Company"/>
<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"
sequenceNum="0"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML"
portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML"
portalPortletId="communications" 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"/>
@@ -134,7 +133,8 @@
<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-NOEML2"
portalPortletId="communications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
+ <PortletAttribute portalPageId="MYPORTAL_EMPL-NOEML2"
portalPortletId="communications" portletSeqId="00001"
attrName="communicationPartyId" attrValue="Company"/>
<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"/>
@@ -167,9 +167,7 @@
<PortletPortletCategory portalPortletId="contact"
portletCategoryId="PROFILE"/>
<PortletPortletCategory portalPortletId="party"
portletCategoryId="PROFILE"/>
- <PortletPortletCategory portalPortletId="mycommunications"
portletCategoryId="COMMUNICATIONS"/>
<PortletPortletCategory portalPortletId="mycompanycomms"
portletCategoryId="COMMUNICATIONS"/>
- <PortletPortletCategory portalPortletId="otherCommunications"
portletCategoryId="COMMUNICATIONS"/>
<PortletPortletCategory portalPortletId="mytasks"
portletCategoryId="TASKS"/>
<PortletPortletCategory portalPortletId="mytimesheet"
portletCategoryId="TIMESHEETS"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sun Mar 15
02:56:28 2009
@@ -103,39 +103,6 @@
<field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
</form>
- <form name="ListPartyCommEvents" extends="ListCommEvents"
extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
type="list">
- <row-actions>
- <set field="toComplete"
value="${bsh:"COM_ROLE_READ".equals(roleStatusId)?"toComplete":""}"/>
- </row-actions>
- <field name="portalPageId"><hidden/></field>
- <field name="roleTypeId"><display-entity entity-name="RoleType"
description="${description}"/></field>
- <field name="removeLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="smallSubmit">
- <hyperlink also-hidden="false"
description="${uiLabelMap.CommonDelete}"
target="RemoveCommunicationEventRole?partyId=${partyId}&communicationEventId=${communicationEventId}&roleTypeId=${roleTypeId}&deleteCommEventIfLast=Y&delContentDataResource=Y&portalPageId=${parameters.portalPageId}"/>
- </field>
- <field name="subject" widget-style="buttontext"
widget-area-style="fieldWidth300">
- <hyperlink description="${subject} "
target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&partyId=${partyId}&roleTypeId=${roleTypeId}&portalPageId=${portalPageId}"/>
- </field>
- <field name="statusId" entry-name="roleStatusId"
widget-style="buttontext" widget-area-style="fieldWidth300">
- <display-entity entity-name="StatusItem"
description="${description}">
- <sub-hyperlink description="${uiLabelMap.MyPortalToComplete}"
target="setCommunicationEventRoleStatus?communicationEventId=${communicationEventId}&partyId=${partyId}&roleTypeId=${roleTypeId}&statusId=COM_ROLE_COMPLETED&donePage=${parameters.donePage}&VIEW_SIZE=${parameters.VIEWSIZE}&VIEW_INDEX=${parameters.VIEW_INDEX}"/>
- </display-entity>
- </field>
- <field name="createdStamp" entry-name="entryDate"/>
- </form>
- <form name="ListMyUnknownPartyEmails" type="multi"
- extends="ListMyUnknownPartyEmails"
extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
use-row-submit="true">
- <field name="portalPageId"><hidden/></field>
- <field name="subject" widget-style="buttontext"
widget-area-style="fieldWidth300">
- <hyperlink description="${subject}"
target="deleteCommunicationEvents?portalPageId=${parameters.portalPageId}"/>
- </field>
- <field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
- <check />
- </field>
- <field name="deleteSelectedButton" widget-style="smallSubmit">
- <submit />
- </field>
- </form>
-
<form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts"
extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
<field name="workEffortId">
<hyperlink
target="/projectmgr/control/taskView?workEffortId=${workEffortId}"
description="${workEffortName} [${workEffortId}]" target-type="inter-app"/>
@@ -222,25 +189,6 @@
<field name="amountToApply" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
</form>
- <form name="ListDraftEmails" type="list" extends="ListCommEvents"
extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
- use-row-submit="true">
- <actions>
- <entity-condition entity-name="CommunicationEvent"
list="commEvents">
- <condition-list combine="and">
- <condition-expr field-name="statusId" operator="equals"
value="COM_PENDING"/>
- <condition-expr field-name="partyIdFrom" operator="equals"
value="${partyId}"/>
- </condition-list>
- <order-by field-name="-lastUpdatedStamp"/>
- </entity-condition>
- </actions>
- <field name="subject">
- <hyperlink description="${subject}"
target="EditCommunicationEvent?communicationEventId=${communicationEventId}&communicationEventTypeId=EMAIL_COMMUNICATION&partyId=${userLogin.partyId}"/>
- </field>
- <field name="removeLink" title="${uiLabelMap.CommonDelete}"
widget-style="smallSubmit">
- <hyperlink also-hidden="false"
description="${uiLabelMap.CommonDelete}"
target="deletePartyCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}&portalPageId=${portalPageId}"/>
- </field>
- </form>
-
<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"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Sun Mar 15
02:56:28 2009
@@ -35,37 +35,6 @@
<link target="newEvent?portalPageId=${parameters.portalPageId}"/>
</menu-item>
</menu>
- <menu name="communicationsMenu">
- <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
- <condition>
- <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
- </condition>
- <link
-
target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&portalPageId=${parameters.portalPageId}&statusId=COM_PENDING"/>
- </menu-item>
- <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}">
- <condition>
- <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
- </condition>
- <link
-
target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&portalPageId=${parameters.portalPageId}"
/>
- </menu-item>
- <menu-item name="openEvents" title="${uiLabelMap.MyPortalOpenEvents}">
- <condition>
- <if-compare field="parameters.all" operator="equals"
value="true" />
- </condition>
- <link
target="showPortalPage?portalPageId=${parameters.portalPageId}&all=false" />
- </menu-item>
- <menu-item name="allOtherEvents"
title="${uiLabelMap.MyPortalAllEvents}">
- <condition>
- <or>
- <if-compare field="parameters.all" operator="equals"
value="false" />
- <if-empty field="parameters.all"/>
- </or>
- </condition>
- <link
target="showPortalPage?portalPageId=${parameters.portalPageId}&all=true" />
- </menu-item>
- </menu>
<menu name="MyTasksMenu" type="simple" menu-container-style="button-bar
button-style-2" default-selected-style="selected"
selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="myTasks" title="${uiLabelMap.MyPortalMyTasks}"><link
target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=754604&r1=754603&r2=754604&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Mar 15
02:56:28 2009
@@ -177,122 +177,6 @@
</widgets>
</section>
</screen>
- <screen name="MyCommunications">
- <section>
- <actions>
- <set field="partyId" from-field="userLogin.partyId" />
- <set field="portalPageId" value="myCommunications"/>
- </actions>
- <widgets>
- <include-screen name="Communications"/>
- </widgets>
- </section>
- </screen>
- <screen name="Communications">
- <section>
- <actions>
- <set field="all" from-field="parameters.all"/>
- <entity-condition entity-name="CommunicationEventAndRole"
- list="commEvents">
- <condition-list combine="and">
- <condition-expr field-name="statusId"
operator="not-equals"
- value="COM_UNKNOWN_PARTY" />
- <condition-expr field-name="statusId"
operator="not-equals"
- value="COM_PENDING" />
- <condition-expr field-name="partyId" operator="equals"
- value="${partyId}" />
- <condition-expr field-name="roleStatusId"
- operator="not-equals"
value="COM_ROLE_COMPLETED" ignore="${all}" />
- </condition-list>
- <order-by field-name="-datetimeStarted" />
- </entity-condition>
- <entity-condition entity-name="CommunicationEventAndRole"
- list="commEventsUnknown">
- <condition-list combine="and">
- <condition-expr field-name="statusId" operator="equals"
- value="COM_UNKNOWN_PARTY" />
- <condition-expr field-name="roleStatusId"
operator="not-equals"
- value="COM_ROLE_COMPLETED" />
- <condition-expr field-name="partyId" operator="equals"
- value="${partyId}" />
- </condition-list>
- <order-by field-name="-datetimeStarted" />
- </entity-condition>
- <entity-condition entity-name="CommunicationEventAndRole"
list="commEventDraft">
- <condition-list combine="and">
- <condition-expr field-name="statusId"
operator="equals"
- value="COM_PENDING"/>
- <condition-expr field-name="partyId" operator="equals"
- value="${partyId}"/>
- </condition-list>
- <order-by field-name="-datetimeStarted" />
- </entity-condition>
- <entity-one entity-name="PartyNameView"
value-field="partyName">
- <field-map field-name="partyId" from-field="partyId"/>
- </entity-one>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.MyPortalCommunicationsOfParty}:
${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" />
- <section>
- <condition>
- <not>
- <if-empty field="commEventsUnknown" />
- </not>
- </condition>
- <widgets>
- <label style="h2"
text="${uiLabelMap.MyPortalEmailsFromUnknownOrigin}"></label>
- <include-form
-
location="component://myportal/widget/MyPortalForms.xml"
- name="ListMyUnknownPartyEmails" />
- </widgets>
- </section>
- <label style="h2"
text="${uiLabelMap.MyPortalEmailsFromKnownOrigin}"></label>
- <include-form name="ListPartyCommEvents"
-
location="component://myportal/widget/MyPortalForms.xml" />
- <section>
- <condition>
- <not>
- <if-empty field="commEventDraft" />
- </not>
- </condition>
- <widgets>
- <label style="h2"
text="${uiLabelMap.MyPageDraftEmails}"></label>
- <include-form
-
location="component://myportal/widget/MyPortalForms.xml"
- name="ListDraftEmails" />
- </widgets>
- </section>
- </screenlet>
- </widgets>
- </section>
- </screen>
- <screen name="OtherCommunications">
- <section>
- <actions>
- <set field="portalPageId" value="otherCommunications"/>
- <entity-and list="emailOwners" entity-name="PartyRelationship"
filter-by-date="true">
- <field-map field-name="partyIdFrom"
value="${userLogin.partyId}" />
- <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN"
/>
- </entity-and>
- </actions>
- <widgets>
- <iterate-section entry="emailOwner" list="emailOwners">
- <section>
- <actions>
- <set field="partyId"
from-field="emailOwner.partyIdTo" />
- </actions>
- <widgets>
- <include-screen name="Communications"/>
- </widgets>
- </section>
- </iterate-section>
- </widgets>
- </section>
- </screen>
<screen name="ViewCommunicationEvent">
<section>
<actions>
