Changeset 553 for trunk/grails-app

Timestamp:

May 31, 2010, 1:54:53 PM (14 years ago)

Author:

gav

Message:

Small refator of DateUtilService.
New plusMonth() replaces getNextMonth and getPreviousMonth().
Clarify getDayFromDate() to getDayOfMonthFromDate().

Location:

trunk/grails-app

Files:

• controllers/TaskDetailedController.groovy (modified) (1 diff)
• services/DateUtilService.groovy (modified) (2 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -809 +809 @@
         result.today.year = dateUtilService.getYearFromDate(result.today.date)
         result.nextMonth = [:]
-        result.nextMonth.date = dateUtilService.getNextMonth(showDate)
+        result.nextMonth.date = dateUtilService.plusMonth(showDate)
         result.nextMonth.month = dateUtilService.getMonthFromDate(result.nextMonth.date)
         result.nextMonth.year = dateUtilService.getYearFromDate(result.nextMonth.date)
         result.previousMonth =  [:]
-        result.previousMonth.date = dateUtilService.getPreviousMonth(showDate)
+        result.previousMonth.date = dateUtilService.plusMonth(showDate, -1)
         result.previousMonth.month = dateUtilService.getMonthFromDate(result.previousMonth.date)
         result.previousMonth.year = dateUtilService.getYearFromDate(result.previousMonth.date)

trunk/grails-app/services/DateUtilService.groovy

@@ -77 +77 @@
 
     /**
-    * Get the date one month in the future.
-    * @param date The Date object to start with.
-    * @returns A Date object one month in the future.
+    * Get the date plus x weeks.
+    * @param date The Date object to start with, defaults to today.
+    * @param plusYears The number of weeks to add, defaults to 1.
+    * @returns A Date object adjusted by x weeks.
     */
-    public static Date getNextMonth(Date date) {
+    public static Date plusWeek(Date date = new Date(), Integer plusWeeks = 1) {
         use(TimeCategory) {
-            date + 1.months
+            date + plusWeeks.weeks
         }
     }
 
     /**
-    * Get the date one month ago.
-    * @param date The Date object to start with.
-    * @returns A Date object one month ago.
+    * Get the date plus x months.
+    * @param date The Date object to start with, defaults to today.
+    * @param plusYears The number of months to add, defaults to 1.
+    * @returns A Date object adjusted by x months.
     */
-    public static Date getPreviousMonth(Date date) {
+    public static Date plusMonth(Date date = new Date(), Integer plusMonths = 1) {
         use(TimeCategory) {
-            date - 1.months
+            date + plusMonths.months
         }
     }
@@ -133 +135 @@
     * @returns An integer representing the day of the month.
     */
-    public static Integer getDayFromDate(Date date) {
+    public static Integer getDayOfMonthFromDate(Date date) {
         Calendar cal = Calendar.instance
         cal.setTime(date)