Changeset 1432

Timestamp:

01/19/10 09:11:52 (8 months ago)

Author:

bruno

Message:

Fix problems in the reporting:
- for the first days of 2010, the composed week index was '201053', causing the reports to be empty since this start week was always larger than any end week in 2010.
- in the RawDataResource?, no zero was prepended for weeks < 10 (though this was done in InvoiceResource?)

Location:

tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource

Files:

• CalendarUtil.java (modified) (2 diffs)
• InvoiceResource.java (modified) (1 diff)
• RawDataResource.java (modified) (3 diffs)

tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/CalendarUtil.java

@@ -13 +13 @@
     private static final Pattern WEEK_RANGE = Pattern.compile("^" + WEEK_PATTERN_STRING + "-" + WEEK_PATTERN_STRING + "$");
 
+    public static Locale CALENDAR_LOCALE = new Locale("nl", "BE");
+
     public static Calendar getCalendar() {
         // The firstDayOfWeek and minimalDaysInFirstWeek fields
         // are dependent on the Locale, we use the Belgian settings
-        return new GregorianCalendar(new Locale("nl", "BE"));
+        return new GregorianCalendar(CALENDAR_LOCALE);
     }
 
@@ -89 +91 @@
         return new int[] {startWeek, startYear, endWeek, endYear};
     }
+
+    public static int[] getWeekAndYear(Calendar calendar) {
+        int year = calendar.get(YEAR);
+        int week = calendar.get(WEEK_OF_YEAR);
+
+        // At the beginning of the year, the day might fall in the last week of
+        // last year, while the year value would point to the new year.
+        // We adjust by letting the year value match the week.
+        // (see getCalendar(week, year) for similar problem)
+        if (calendar.get(MONTH) == JANUARY && week > 50) {
+            year--;
+        }
+
+        return new int[] {week, year};
+    }
+
+    public static long getWeekIndex(int week, int year) {
+        return Long.parseLong(String.valueOf(year) + (week < 10 ? "0" + week : week));
+    }
+
 }

tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/InvoiceResource.java

@@ -63 +63 @@
             DateTime to = iso8601.parseDateTime((String) getRequest().getAttributes().get("to"));
 
-            Calendar cal = CalendarUtil.getCalendar();
-            cal.setTime(from.toDate());
-            templateData.put("beginWeek", cal.get(Calendar.WEEK_OF_YEAR));
-            long beginIndex = Long.parseLong("" + cal.get(Calendar.YEAR) + "" + (cal.get(Calendar.WEEK_OF_YEAR) < 10 ? "0" + cal.get(Calendar.WEEK_OF_YEAR) : cal.get(Calendar.WEEK_OF_YEAR)));
-            cal.setTime(to.toDate());
-            templateData.put("endWeek", cal.get(Calendar.WEEK_OF_YEAR));
-            long endIndex = Long.parseLong("" + cal.get(Calendar.YEAR) + "" + (cal.get(Calendar.WEEK_OF_YEAR) < 10 ? "0" + cal.get(Calendar.WEEK_OF_YEAR) : cal.get(Calendar.WEEK_OF_YEAR)));
+            int[] fromWY = CalendarUtil.getWeekAndYear(from.toCalendar(CalendarUtil.CALENDAR_LOCALE));
+            int[] toWY = CalendarUtil.getWeekAndYear(to.toCalendar(CalendarUtil.CALENDAR_LOCALE));
+
+            long beginIndex = CalendarUtil.getWeekIndex(fromWY[0], fromWY[1]);
+            long endIndex = CalendarUtil.getWeekIndex(toWY[0], toWY[1]);
 
             Form form = getRequest().getResourceRef().getQueryAsForm();

tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/RawDataResource.java

@@ -5 +5 @@
 package org.kauriproject.tupper.resource;
 
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.GregorianCalendar;
 import java.util.List;
 import org.kauriproject.tupper.api.Tupper;
@@ -58 +56 @@
             DateTime to = iso8601.parseDateTime((String) getRequest().getAttributes().get("to"));
 
-            Calendar calendar = CalendarUtil.getCalendar();
-            calendar.setTime(from.toDate());
-            long beginweek = Long.parseLong("" + calendar.get(GregorianCalendar.YEAR) + calendar.get(GregorianCalendar.WEEK_OF_YEAR));
-            calendar.setTime(to.toDate());
-            long endweek = Long.parseLong("" + calendar.get(GregorianCalendar.YEAR) + calendar.get(GregorianCalendar.WEEK_OF_YEAR));
+            int[] fromWY = CalendarUtil.getWeekAndYear(from.toCalendar(CalendarUtil.CALENDAR_LOCALE));
+            int[] toWY = CalendarUtil.getWeekAndYear(to.toCalendar(CalendarUtil.CALENDAR_LOCALE));
+
+            long beginweek = CalendarUtil.getWeekIndex(fromWY[0], fromWY[1]);
+            long endweek = CalendarUtil.getWeekIndex(toWY[0], toWY[1]);
 
             Form form = getRequest().getResourceRef().getQueryAsForm();
@@ -68 +66 @@
             String projectId = form.getValues("proj");
             String custInitials = form.getValues("cust");
-            List<Performance> performances = new ArrayList<Performance>();
+            List<Performance> performances;
 
             try {