dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15051
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-04-28 15:56:39 +0545
message:
  made it possible to specify date format when creating period generator, makes it easy to switch formats if we in the future want to handle this using a system setting
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js	2014-04-28 09:45:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js	2014-04-28 10:11:39 +0000
@@ -42,27 +42,36 @@
  *  - dhis2.period.generator  An instance of this class using the system calendar
  *
  * @param calendar Calendar to use, this must coming from $.calendars.instance(chronology).
+ * @param format Date format to use for formatting, will default to ISO 8601
  * @constructor
  */
-dhis2.period.PeriodGenerator = function( calendar ) {
+dhis2.period.PeriodGenerator = function( calendar, format ) {
   if( typeof calendar === 'undefined' ) {
     calendar = dhis2.period.calendar;
   }
 
+  if( typeof format === 'undefined' ) {
+    format = dhis2.period.DEFAULT_DATE_FORMAT;
+  }
+
+  // $.calendars date formatter uses a different format than joda-time/JdkCalendar, for the most common cases we can get away
+  // with just doing lower case on the string, but special handling might be needed in the future.
+  format = format.toLowerCase();
+
   this.calendar = calendar;
 
   this.periodTypes = {
-    "Daily": dhis2.period.makeDailyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "Weekly": dhis2.period.makeWeeklyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "Monthly": dhis2.period.makeMonthlyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "BiMonthly": dhis2.period.makeBiMonthlyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "Quarterly": dhis2.period.makeQuarterlyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "SixMonthly": dhis2.period.makeSixMonthlyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "SixMonthlyApril": dhis2.period.makeSixMonthlyAprilPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "Yearly": dhis2.period.makeYearlyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "FinancialApril": dhis2.period.makeFinancialAprilPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "FinancialJuly": dhis2.period.makeFinancialJulyPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT),
-    "FinancialOct": dhis2.period.makeFinancialOctoberPeriodGenerator(calendar, dhis2.period.DEFAULT_DATE_FORMAT)
+    "Daily": dhis2.period.makeDailyPeriodGenerator(calendar, format),
+    "Weekly": dhis2.period.makeWeeklyPeriodGenerator(calendar, format),
+    "Monthly": dhis2.period.makeMonthlyPeriodGenerator(calendar, format),
+    "BiMonthly": dhis2.period.makeBiMonthlyPeriodGenerator(calendar, format),
+    "Quarterly": dhis2.period.makeQuarterlyPeriodGenerator(calendar, format),
+    "SixMonthly": dhis2.period.makeSixMonthlyPeriodGenerator(calendar, format),
+    "SixMonthlyApril": dhis2.period.makeSixMonthlyAprilPeriodGenerator(calendar, format),
+    "Yearly": dhis2.period.makeYearlyPeriodGenerator(calendar, format),
+    "FinancialApril": dhis2.period.makeFinancialAprilPeriodGenerator(calendar, format),
+    "FinancialJuly": dhis2.period.makeFinancialJulyPeriodGenerator(calendar, format),
+    "FinancialOct": dhis2.period.makeFinancialOctoberPeriodGenerator(calendar, format)
   };
 };