svn commit: r786529 - in /ofbiz/trunk/applications/workeffort: entitydef/entitymodel.xml widget/WorkEffortForms.xml

[adrianc]

Author: adrianc
Date: Fri Jun 19 14:58:35 2009
New Revision: 786529

URL: http://svn.apache.org/viewvc?rev=786529&view=rev
Log:
Added partyId to work effort event reminders. Popup reminders (alarms) can be assigned to specific parties.

Modified:
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=786529&r1=786528&r2=786529&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Fri Jun 19 14:58:35 2009
@@ -470,6 +470,9 @@
       <field name="workEffortId" type="id-ne"></field>
       <field name="sequenceId" type="id-ne"></field>
       <field name="contactMechId" type="id"></field>
+      <field name="partyId" type="id">
+          <description>The party this reminder is assigned to</description>
+      </field>
       <field name="reminderDateTime" type="date-time"></field>
       <field name="repeatCount" type="numeric"></field>
       <field name="repeatInterval" type="numeric">
@@ -489,6 +492,9 @@
       <relation type="one" fk-name="WE_EVENT_REMIND_CM" rel-entity-name="ContactMech">
         <key-map field-name="contactMechId"/>
       </relation>
+      <relation type="one" fk-name="WE_EVENT_REMIND_PTY" rel-entity-name="Party">
+        <key-map field-name="partyId"/>
+      </relation>
     </entity>
     <entity entity-name="WorkEffortFixedAssetAssign"
             package-name="org.ofbiz.workeffort.workeffort"

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=786529&r1=786528&r2=786529&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Jun 19 14:58:35 2009
@@ -1306,10 +1306,11 @@
         <field name="workEffortId"><hidden/></field>
         <field name="sequenceId"><hidden/></field>
         <field name="contactMechId"><display/></field>
+        <field name="partyId"><display/></field>
         <field name="reminderDateTime"><date-time/></field>
         <field name="repeatCount"><text/></field>
         <field name="repeatInterval"><text/></field>
-        <field name="reminderOffset"><text/></field>
+        <field name="reminderOffset"><lookup target-form-name="LookupTimeDuration"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder">
@@ -1326,6 +1327,7 @@
         <field name="localeId"><hidden value="${locale}"/></field>
         <field name="timeZoneId"><hidden value="${timeZone}"/></field>
         <field name="contactMechId"><lookup target-form-name="LookupContactMech"/></field>
+        <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="reminderDateTime"><date-time/></field>
         <field name="repeatCount"><text/></field>
         <field name="repeatInterval"><text/></field>