dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5053 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-10-27 15:40:23 +0200
message:
  (DV) Init request minified.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonInitialize.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-visualizer/src/main/webapp/dhis-web-visualizer/jsonInitialize.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonInitialize.vm	2011-09-29 13:48:07 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonInitialize.vm	2011-10-27 13:39:17 +0000
@@ -1,56 +1,1 @@
-{
-  "system": {
-    "rootNode": {
-      "id":"$!{rootNode.id}",
-      "name":"$!encoder.jsonEncode( ${rootNode.name} )",
-      "level":1
-    },
-    "periods": {
-      "lastMonth": [
-        #foreach( $period in $lastMonth ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $lastMonth.size() ),
-        #end#end
-        
-      ],
-      "monthsThisYear": [
-        #foreach( $period in $monthsThisYear ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $monthsThisYear.size() ),
-        #end#end
-        
-      ],
-      "monthsLastYear": [
-        #foreach( $period in $monthsLastYear ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $monthsLastYear.size() ),
-        #end#end
-        
-      ],
-      "lastQuarter": [
-        #foreach( $period in $lastQuarter ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $lastQuarter.size() ),
-        #end#end
-        
-      ],
-      "quartersThisYear": [
-        #foreach( $period in $quartersThisYear ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $quartersThisYear.size() ),
-        #end#end
-        
-      ],
-      "quartersLastYear": [
-        #foreach( $period in $quartersLastYear ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $quartersLastYear.size() ),
-        #end#end
-        
-      ],
-      "thisYear": [
-        #foreach( $period in $thisYear ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $thisYear.size() ),
-        #end#end
-        
-      ],
-      "lastYear": [
-        #foreach( $period in $lastYear ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $lastYear.size() ),
-        #end#end
-        
-      ],
-      "lastFiveYears": [
-        #foreach( $period in $lastFiveYears ){"id":"$!{period.id}", "name":"$!encoder.jsonEncode( ${period.name} )"}#if( $velocityCount < $lastFiveYears.size() ),
-        #end#end
-        
-      ]
-    }
-  }
-}
\ No newline at end of file
+{"system":{"rootNode":{"id":"$!{rootNode.id}","name":"$!encoder.jsonEncode(${rootNode.name})","level":1},"periods":{"lastMonth":[#foreach($period in $lastMonth){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$lastMonth.size()),#end#end],"monthsThisYear":[#foreach($period in $monthsThisYear){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$monthsThisYear.size()),#end#end],"monthsLastYear":[#foreach($period in $monthsLastYear){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$monthsLastYear.size()),#end#end],"lastQuarter":[#foreach($period in $lastQuarter){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$lastQuarter.size()),#end#end],"quartersThisYear":[#foreach($period in $quartersThisYear){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$quartersThisYear.size()),#end#end],"quartersLastYear":[#foreach($period in $quartersLastYear){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$quartersLastYear.size()),#end#end],"thisYear":[#foreach($period in $thisYear){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$thisYear.size()),#end#end],"lastYear":[#foreach($period in $lastYear){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$lastYear.size()),#end#end],"lastFiveYears":[#foreach($period in $lastFiveYears){"id":"$!{period.id}","name":"$!encoder.jsonEncode(${period.name})"}#if($velocityCount<$lastFiveYears.size()),#end#end]}}}
\ No newline at end of file