Changeset 136 for trunk

Timestamp:

May 15, 2009, 4:09:30 PM (16 years ago)

Author:

gav

Message:

Work on TaskRecurringSchedule?.

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (3 diffs)
• controllers/PersonController.groovy (modified) (1 diff)
• controllers/TaskRecurringScheduleDetailedController.groovy (modified) (4 diffs)
• domain/Period.groovy (modified) (1 diff)
• domain/TaskRecurringSchedule.groovy (modified) (3 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -32 +32 @@
     {
         println "BootStrapping demo data..."
+        3.times{println it}
 
 /***********************
@@ -415 +416 @@
         taskRecurringScheduleInstance = new TaskRecurringSchedule(task: Task.get(1),
                                                                                                     recurEvery: 1,
-                                                                                                    period: Period.get(1),
-                                                                                                    nextDueDate: new Date())
+                                                                                                    recurPeriod: Period.get(1),
+                                                                                                    startDate: new Date(),
+                                                                                                    generateAhead: 1,
+                                                                                                    generateAheadPeriod: Period.get(1),
+                                                                                                    taskDuration: 1,
+                                                                                                    taskDurationPeriod: Period.get(1))
         BootStrapSaveAndTest(taskRecurringScheduleInstance)
 
@@ -422 +427 @@
         taskRecurringScheduleInstance = new TaskRecurringSchedule(task: Task.get(2),
                                                                                                     recurEvery: 1,
-                                                                                                    period: Period.get(1),
-                                                                                                    nextDueDate: new Date())
+                                                                                                    recurPeriod: Period.get(1),
+                                                                                                    startDate: new Date(),
+                                                                                                    generateAhead: 1,
+                                                                                                    generateAheadPeriod: Period.get(1),
+                                                                                                    taskDuration: 1,
+                                                                                                    taskDurationPeriod: Period.get(1))
         BootStrapSaveAndTest(taskRecurringScheduleInstance)
 

trunk/grails-app/controllers/PersonController.groovy

@@ -39 +39 @@
         /**
          * Person delete action. Before removing an existing person,
-         * he should be removed from those authorities which he is involved.
+         * they should be removed from those authorities which they are involved.
          */
         def delete = {

trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+import org.codehaus.groovy.runtime.TimeCategory
 
 class TaskRecurringScheduleDetailedController extends BaseController {
@@ -66 +67 @@
                 }
             }
-            taskRecurringScheduleInstance.properties = params
+//             taskRecurringScheduleInstance.properties = params
+            setUpdateProperties()
+                    
             if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) {
                 flash.message = "TaskRecurringSchedule ${params.id} updated"
@@ -104 +107 @@
                 else {
                         
-                        taskRecurringScheduleInstance.nextDueDate = new Date()
-                                
-//                      taskRecurringScheduleInstance.nextDueDate = calculateNextDueDate(new Date()) 
-                        
                         if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) {
                                 
@@ -127 +126 @@
 
     }
-        
-//      private Date calculateNextDueDate(nextDue) {
-// //           def now = new Date()
-// //           def calculatedDays = new Integer()
-// //           def nextDue = new Date()
-//                              
-// //           switch (period) {
-// //                   case "Day(s)":
-// //                           calculatedDays = period
-// //                           nextDue = now + calculatedDays
-// //                   case "Week(s)":
-// //                           calculatedDays = period * 7
-// //                           nextDue = now + calculatedDays
-// // //                        default:
-// //           }
-//              nextDue = nextDue + 1
-//              return nextDue
-//      }
-        
+                
+    private setUpdateProperties() {
+        def originalStartDate = taskRecurringScheduleInstance.startDate
+        
+        if(taskRecurringScheduleInstance.startDate == params.startDate) {
+            taskRecurringScheduleInstance.properties = params
+        }
+        else {
+            taskRecurringScheduleInstance.properties = params
+            taskRecurringScheduleInstance.nextTargetStartDate = params.startDate
+        }
+        
+    }
+
+/*    
+    private Date calculateNextDueDate(recurEvery, period, startDate) {
+        def nextDue = new Date()
+        
+        switch (period) {
+            case "Day(s)":
+                use(TimeCategory) {
+                    nextDue = startDate + recurEvery.days
+                }
+                return nextDue
+            case "Week(s)":
+                use(TimeCategory) {
+                    nextDue = startDate + recurEvery.weeks
+                }
+                return nextDue
+            case "Month(s)":
+                use(TimeCategory) {
+                    nextDue = startDate + recurEvery.months
+                }
+                return nextDue
+            case "Year(s)":
+                use(TimeCategory) {
+                    nextDue = startDate + recurEvery.years
+                }
+                return nextDue
+            default:
+                return nextDue
+        }
+        
+    }*/
 }

trunk/grails-app/domain/Period.groovy

@@ -5 +5 @@
 
     static hasMany = [taskRecurringSchedules: TaskRecurringSchedule]
-// 
+    
+    static mappedBy = [taskRecurringSchedules:"recurPeriod"]
+
 //     static belongsTo = []
-// 
+
 //     static constraints = {
 // 

trunk/grails-app/domain/TaskRecurringSchedule.groovy

@@ +1 @@
+import org.codehaus.groovy.runtime.TimeCategory
+
 class TaskRecurringSchedule {
 
     Task lastGeneratedSubTask
-    Period period
+    Period recurPeriod
+    Period generateAheadPeriod
+    Period taskDurationPeriod
 
     Integer recurEvery = 1
+    Integer taskDuration = 0
+    Integer generateAhead = 1
     Date startDate = new Date()
     Date lastGeneratedDate
-    Date nextDueDate
+    Date nextTargetStartDate = new Date()
+    Date nextTargetCompletionDate = new Date()
+    Date nextGenerationDate = new Date()
     boolean isEnabled = true
 
@@ -15 +23 @@
 
     static constraints = {
+//              startDate(validator: {return (it > new Date())})
+        recurEvery(min:0, max:365)
+        taskDuration(min:0, max:365)
+        generateAhead(min:0, max:365)
         lastGeneratedDate(blank:true, nullable:true)
         lastGeneratedSubTask(blank:true, nullable:true)
@@ -20 +32 @@
 
     String toString() {
-        "Recur every ${recurEvery} ${period}"
+        "Recur every ${recurEvery} ${recurPeriod}"
     }
+    
+    //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.
+    def beforeInsert = {
+        def now = new Date()
+        
+        nextTargetStartDate = startDate
+        
+        //nextGenerationDate
+        switch (generateAheadPeriod.period) {
+            case "Day(s)":
+                use(TimeCategory) {
+                    nextGenerationDate = nextTargetStartDate - generateAhead.days
+                }
+                break
+            case "Week(s)":
+                use(TimeCategory) {
+                    nextGenerationDate = nextTargetStartDate - generateAhead.weeks
+                }
+                break
+            case "Month(s)":
+                use(TimeCategory) {
+                    nextGenerationDate = nextTargetStartDate - generateAhead.months
+                }
+                break
+            case "Year(s)":
+                use(TimeCategory) {
+                    nextGenerationDate = nextTargetStartDate - generateAhead.years
+                }
+                break
+        default:
+                break
+        }
+        
+        if( nextGenerationDate < now) {nextGenerationDate = now}
+        
+        //nextTargetCompletionDate
+        switch (taskDurationPeriod.period) {
+            case "Day(s)":
+                use(TimeCategory) {
+                    nextTargetCompletionDate = nextTargetStartDate + taskDuration.days
+                }
+                break
+            case "Week(s)":
+                use(TimeCategory) {
+                    nextTargetCompletionDate = nextTargetStartDate + taskDuration.weeks
+                }
+                break
+            case "Month(s)":
+                use(TimeCategory) {
+                    nextTargetCompletionDate = nextTargetStartDate + taskDuration.months
+                }
+                break
+            case "Year(s)":
+                use(TimeCategory) {
+                    nextTargetCompletionDate = nextTargetStartDate + taskDuration.years
+                }
+                break
+        default:
+                break
+        }
+        
+    }
+
 }