svn commit: r701755 - in /ofbiz/trunk: applications/party/webapp/partymgr/communication/CommForms.xml specialpurpose/projectmgr/widget/forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Sun Oct  5 00:07:51 2008
New Revision: 701755

URL: http://svn.apache.org/viewvc?rev=701755&view=rev
Log:
make selection on email address more accurate and show completion button on mytask list

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.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=701755&r1=701754&r2=701755&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sun Oct  5 00:07:51 2008
@@ -119,6 +119,27 @@
     </form>
     
     <form name="NewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
+        <actions>
+            <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString(&quot;yyyy-MM-dd HH:mm:ss.S&quot;)}" type="String"/>            
+            <entity-condition entity-name="PartyContactWithPurpose" list-name="emailAddresses">
+                <condition-list combine="and">
+                    <condition-expr field-name="partyId" value="${userLogin.partyId}"/>
+                    <condition-expr field-name="contactFromDate" operator="less-equals" env-name="nowDate"/>
+                    <condition-list combine="or">
+                        <condition-expr field-name="contactThruDate" env-name="null"/>
+                        <condition-expr field-name="contactThruDate" operator="greater-equals" env-name="nowDate"/>
+                    </condition-list>
+                    <condition-expr field-name="purposeFromDate" operator="less-equals" env-name="nowDate"/>
+                    <condition-list combine="or">
+                        <condition-expr field-name="purposeThruDate" operator="greater-equals" env-name="nowDate"/>
+                        <condition-expr field-name="purposeThruDate" env-name="null"/>
+                    </condition-list>
+                    <condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/>
+                    <condition-expr field-name="contactMechTypeId" operator="equals" value="EMAIL_ADDRESS"/>
+                </condition-list>
+                <order-by field-name="infoString"/>
+            </entity-condition>
+        </actions>
         <field name="donePage"><hidden/></field>
         <field name="communicationEventTypeId"><hidden value="AUTO_EMAIL_COMM"/></field>
         <field name="statusId"><hidden value="COM_IN_PROGRESS"/></field>
@@ -126,12 +147,7 @@
         <field name="partyIdFrom"><hidden value="${userLogin.partyId}"/></field>
         <field name="emailAddress" parameter-name="contactMechIdFrom">
             <drop-down>
-                <entity-options entity-name="PartyContactWithPurpose" description="${infoString}" key-field-name="contactMechId">
-                    <entity-constraint name="partyId" value="${userLogin.partyId}"/>
-                    <entity-constraint name="contactMechTypeId" value="EMAIL_ADDRESS"/>
-                    <entity-constraint name="contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
-                    <entity-order-by field-name="infoString"/>
-                </entity-options>
+                <list-options list-name="emailAddresses" description="${infoString}" key-name="contactMechId"/>
             </drop-down>
         </field>
         <field name="contactMechIdTo" title="${uiLabelMap.PartyEmailTo}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=701755&r1=701754&r2=701755&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Oct  5 00:07:51 2008
@@ -280,8 +280,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="updateButton"><submit/></field>
         <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>
-        <!-- better set the task to complete in the timesheet, not here -->
-        <!--field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field-->
+        <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field>
     </form>
     <form name="assignTaskToMe" type="single" target="addTaskAssignment"
         header-row-style="header-row" default-table-style="basic-table">