Changeset 137 for trunk/grails-app/domain

Timestamp:

Sep 1, 2009, 10:10:43 PM (15 years ago)

Author:

gav

Message:

Update to grails-1.1.1 release.
Fix WorkDone? and Fault entries not showing after update, now using criteria.
Work on TaskRecurringSchedule, add DateUtilService class, regenerate views to suite.
Finally have correct rollback behaviour on TaskRecurringSchedule? domain object updates by using transactions.
Added name to copyright since the license has no meaning without it.

File:

• trunk/grails-app/domain/TaskRecurringSchedule.groovy (modified) (4 diffs)

trunk/grails-app/domain/TaskRecurringSchedule.groovy

@@ -23 +23 @@
 
     static constraints = {
-//              startDate(validator: {return (it > new Date())})
-        recurEvery(min:0, max:365)
+        recurEvery(min:1, max:365)
         taskDuration(min:0, max:365)
         generateAhead(min:0, max:365)
@@ -35 +34 @@
     }
     
-    //As of Grails 1.1 this does not fire/pass before validation.
-    //But setting defaults above and placing this code here in the hope that this will be fixed in future versions.
+    // As of Grails 1.1.1 this does not fire/pass before validation.
+    // But setting some defaults above to pass validation and placing this code here 
+        // in the hope that this will be fixed in future versions.
     def beforeInsert = {
-        def now = new Date()
-        
         nextTargetStartDate = startDate
-        
-        //nextGenerationDate
+        setNextGenerationDate()
+        setNextTargetCompletionDate()
+    }
+    
+    public void setNextGenerationDate() {
         switch (generateAheadPeriod.period) {
             case "Day(s)":
@@ -67 +68 @@
                 break
         }
-        
+        def now = new Date()
         if( nextGenerationDate < now) {nextGenerationDate = now}
-        
-        //nextTargetCompletionDate
+    }
+    
+    public void setNextTargetCompletionDate() {
         switch (taskDurationPeriod.period) {
             case "Day(s)":
@@ -92 +94 @@
                 }
                 break
-        default:
+            default:
                 break
         }
-        
     }
-
+    
 }