svn commit: r779823 - in /ofbiz/trunk/applications/part
Locked
 
|
Author: hansbak
Date: Fri May 29 03:28:35 2009 New Revision: 779823 URL: http://svn.apache.org/viewvc?rev=779823&view=rev Log: add sending email in progres section Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=779823&r1=779822&r2=779823&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Fri May 29 03:28:35 2009 @@ -4275,12 +4275,6 @@ <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> @@ -4981,6 +4975,9 @@ <value xml:lang="th">à¸à¸±à¸§à¹à¸à¸à¸à¸¹à¹à¹à¸à¹à¹à¸£à¸</value> <value xml:lang="zh">åå§ç¨æ·ä»£ç人</value> </property> + <property key="PartyInProgresstEmails"> + <value xml:lang="en">Emails scheduled to be sent</value> + </property> <property key="PartyInvitation"> <value xml:lang="de">Einladung</value> <value xml:lang="en">Invitation</value> 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=779823&r1=779822&r2=779823&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Fri May 29 03:28:35 2009 @@ -837,4 +837,5 @@ </field> <field name="removeLink" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit/></field> </form> + <form name="ListProgressEmails" type="list" extends="ListPartyCommEvents" list-name="commEventProgress"/> </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=779823&r1=779822&r2=779823&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Fri May 29 03:28:35 2009 @@ -825,29 +825,22 @@ <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-expr field-name="communicationEventTypeId" - operator="equals" value="COMMENT_NOTE" ignore="${internalNotesOnly}"/> + <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="statusId" operator="not-equals" value="COM_IN_PROGRESS"/> + <condition-expr field-name="partyId" operator="equals" value="${partyId}"/> + <condition-expr field-name="roleStatusId" operator="not-equals" value="COM_ROLE_COMPLETED" ignore="${all}"/> + <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" ignore="${internalNotesOnly}"/> </condition-list> - <order-by field-name="-entryDate"/> + <order-by field-name="entryDate"/> </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-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="-entryDate"/> + <order-by field-name="entryDate"/> </entity-condition> <entity-condition entity-name="CommunicationEventAndRole" list="commEventDraft"> <condition-list combine="and"> @@ -855,11 +848,19 @@ <condition-expr field-name="partyId" operator="equals" value="${partyId}"/> <condition-expr field-name="roleTypeId" operator="equals" value="ORIGINATOR"/> </condition-list> - <order-by field-name="-entryDate"/> + <order-by field-name="entryDate"/> </entity-condition> <entity-one entity-name="PartyNameView" value-field="partyName"> <field-map field-name="partyId" from-field="partyId"/> </entity-one> + <entity-condition entity-name="CommunicationEventAndRole" list="commEventProgress"> + <condition-list combine="and"> + <condition-expr field-name="statusId" operator="equals" value="COM_IN_PROGRESS"/> + <condition-expr field-name="partyId" operator="equals" value="${partyId}"/> + <condition-expr field-name="roleTypeId" operator="equals" value="ORIGINATOR"/> + </condition-list> + <order-by field-name="entryDate"/> + </entity-condition> </actions> <widgets> <screenlet title="${uiLabelMap.PartyCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] " @@ -874,7 +875,6 @@ <include-form name="ListMyUnknownPartyEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/> </widgets> </section> - <label style="h2" text="${uiLabelMap.PartyEmailsFromKnownOrigin}"></label> <include-form name="ListPartyCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/> <section> <condition> @@ -885,6 +885,15 @@ <include-form name="ListDraftEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/> </widgets> </section> + <section> + <condition> + <not><if-empty field="commEventProgress"/></not> + </condition> + <widgets> + <label style="h2" text="${uiLabelMap.PartyInProgresstEmails}"></label> + <include-form name="ListProgressEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + </widgets> + </section> </screenlet> </widgets> </section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |