Changeset 136 for trunk/grails-app/controllers

Timestamp:

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

Author:

gav

Message:

Work on TaskRecurringSchedule?.

Location:

trunk/grails-app/controllers

Files:

• PersonController.groovy (modified) (1 diff)
• TaskRecurringScheduleDetailedController.groovy (modified) (4 diffs)

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
+        }
+        
+    }*/
 }