dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1347
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-01-26 16:28:59 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriod.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriods.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriod.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriods.vm


--
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/ajax/jsonPeriod.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriod.vm	2010-01-25 09:23:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriod.vm	2010-01-26 15:28:59 +0000
@@ -2,6 +2,7 @@
   {
     "id": $!{period.id},
     "startDate": "$!format.formatDate( ${period.startDate} )",
-    "endDate": "$!format.formatDate( ${period.endDate} )"
+    "endDate": "$!format.formatDate( ${period.endDate} )",
+    "name": "$!format.formatPeriod( ${period} )"
   }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriods.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriods.vm	2010-01-25 09:23:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPeriods.vm	2010-01-26 15:28:59 +0000
@@ -4,7 +4,8 @@
   {
     "id": $!{period.id},
     "startDate": "$!format.formatDate( ${period.startDate} )",
-    "endDate": "$!format.formatDate( ${period.endDate} )"
+    "endDate": "$!format.formatDate( ${period.endDate} )",
+    "name": "$!format.formatPeriod( ${period} )"
   }#if( $velocityCount < $size ),#end    
 #end
 ] }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriod.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriod.vm	2010-01-25 09:23:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriod.vm	2010-01-26 15:28:59 +0000
@@ -3,4 +3,5 @@
     <id>$period.id</id>
     <startDate>$!format.formatDate( $period.startDate )</startDate>
     <endDate>$!format.formatDate( $period.endDate )</endDate>
+    <name>$!format.formatPeriod( $period )</name>
 </period>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriods.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriods.vm	2010-01-25 09:23:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlPeriods.vm	2010-01-26 15:28:59 +0000
@@ -5,6 +5,7 @@
 	    <id>$period.id</id>
 	    <startDate>$!format.formatDate( $period.startDate )</startDate>
 	    <endDate>$!format.formatDate( $period.endDate )</endDate>
+        <name>$!format.formatPeriod( $period )</name>
 	</period>
 #end
 </periods>
\ No newline at end of file