svn commit: r781414 - in /ofbiz/trunk/applications/workeffort: entitydef/entitymodel.xml src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java

[adrianc]

Author: adrianc
Date: Wed Jun  3 14:55:34 2009
New Revision: 781414

URL: http://svn.apache.org/viewvc?rev=781414&view=rev
Log:
Removed the partially-implemented popup event reminders. I don't plan on finishing it because popup event reminders can be handled by third-party calendar programs.

Modified:
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
    ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=781414&r1=781413&r2=781414&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Wed Jun  3 14:55:34 2009
@@ -470,7 +470,6 @@
       <field name="workEffortId" type="id-ne"></field>
       <field name="contactMechId" type="id-ne"></field>
       <field name="sequenceId" type="id-ne"></field>
-      <field name="isPopup" type="indicator"></field>
       <field name="reminderDateTime" type="date-time"></field>
       <field name="repeatCount" type="numeric"></field>
       <field name="repeatInterval" type="numeric">

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=781414&r1=781413&r2=781414&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Wed Jun  3 14:55:34 2009
@@ -749,17 +749,6 @@
         for (GenericValue reminder : eventReminders) {
             int repeatCount = reminder.get("repeatCount") == null ? 0 : reminder.getLong("repeatCount").intValue();
             int currentCount = reminder.get("currentCount") == null ? 0 : reminder.getLong("currentCount").intValue();
-            String isPopup = reminder.getString("isPopup");
-            if ("Y".equals(isPopup)) {
-                if (repeatCount != 0 && repeatCount == currentCount) {
-                    try {
-                        reminder.remove();
-                    } catch (GenericEntityException e) {
-                        Debug.logWarning("Error while removing work effort event reminder: " + e, module);
-                    }
-                }
-                continue;
-            }
             GenericValue workEffort = null;
             try {
                 workEffort = reminder.getRelatedOne("WorkEffort");