Changeset 219

Timestamp:

Dec 4, 2009, 8:52:26 PM (14 years ago)

Author:

gav

Message:

Make some dates more groovy.

Location:

trunk/grails-app/services

Files:

• TaskRecurringScheduleService.groovy (modified) (3 diffs)
• TaskSearchService.groovy (modified) (6 diffs)

trunk/grails-app/services/TaskRecurringScheduleService.groovy

@@ -15 +15 @@
         taskRecurringScheduleList.each() {
 
-            if ( dateUtilService.getTomorrow() > it.nextGenerationDate) {
+            if ( dateUtilService.tomorrow > it.nextGenerationDate) {
                     def p = [:]
                     p.targetStartDate = it.nextTargetStartDate
@@ -73 +73 @@
                 return fail('task', "task.operationNotPermittedOnTaskInTrash")
 
-            if(result.taskRecurringScheduleInstance.nextTargetStartDate < dateUtilService.getToday())
+            if(result.taskRecurringScheduleInstance.nextTargetStartDate < dateUtilService.today)
                 return fail("nextTargetStartDate", "taskRecurringSchedule.nextTargetStartDate.mayNotBePast")
 
@@ -117 +117 @@
             result.taskRecurringScheduleInstance.properties = params
 
-            if(result.taskRecurringScheduleInstance.nextTargetStartDate < dateUtilService.getToday())
+            if(result.taskRecurringScheduleInstance.nextTargetStartDate < dateUtilService.today)
                 return fail("nextTargetStartDate", "taskRecurringSchedule.nextTargetStartDate.mayNotBePast")
 

trunk/grails-app/services/TaskSearchService.groovy

@@ -17 +17 @@
             sort: params.sort, 
             order: params.order) {
-                ge("targetStartDate", dateUtilService.getToday())
+                ge("targetStartDate", dateUtilService.today)
                 lt("targetStartDate", dateUtilService.getTomorrow())
                 eq("trash", false)
@@ -35 +35 @@
             order: params.order) {
                 eq("leadPerson", Person.get(authenticateService.userDomain().id))
-                ge("targetStartDate", dateUtilService.getToday())
+                ge("targetStartDate", dateUtilService.today)
                 lt("targetStartDate", dateUtilService.getTomorrow())
                 eq("trash", false)
@@ -52 +52 @@
             sort: params.sort, 
             order: params.order) {
-                ge("targetStartDate", dateUtilService.getToday()-7)
+                ge("targetStartDate", dateUtilService.oneWeekAgo)
                 lt("targetStartDate", dateUtilService.getTomorrow())
                 eq("trash", false)
@@ -70 +70 @@
             order: params.order) {
                 eq("leadPerson", Person.get(authenticateService.userDomain().id))
-                ge("targetStartDate", dateUtilService.getToday()-7)
+                ge("targetStartDate", dateUtilService.oneWeekAgo)
                 lt("targetStartDate", dateUtilService.getTomorrow())
                 eq("trash", false)
@@ -88 +88 @@
             order: params.order) {
                 ne("taskType", TaskType.findByName("Unscheduled Breakin"))
-                ge("targetStartDate", dateUtilService.getToday()-7)
+                ge("targetStartDate", dateUtilService.oneWeekAgo)
                 lt("targetStartDate", dateUtilService.getTomorrow())
                 eq("trash", false)
@@ -106 +106 @@
             order: params.order) {
                 eq("taskType", TaskType.findByName("Unscheduled Breakin"))
-                ge("targetStartDate", dateUtilService.getToday()-7)
+                ge("targetStartDate", dateUtilService.oneWeekAgo)
                 lt("targetStartDate", dateUtilService.getTomorrow())
                 eq("trash", false)