dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7483
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-02 13:06:31 +0200
message:
  Tabular report, removed whitespace from template, will be less data to transfer to client
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.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-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-06-20 06:32:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-07-02 11:06:31 +0000
@@ -5,35 +5,31 @@
 #set( $metaData = $noHeader - $valueTypes.size() )
 "total": "$total",
 "columns":[
-	#set($index = 0)
-	#foreach( $col in $grid.getHeaders() )
-	{
-		#set( $mapIndx = $index - $metaData  )
-		"xtype": 	#if( $mapSuggestedValues.get($mapIndx) && $index > $metaData && $mapSuggestedValues.get($mapIndx).size() > 0 )
-						"combobox"
-					#else
-						"textfield"
-					#end,
-		"suggested":  [#set( $suggestedValues = $mapSuggestedValues.get($mapIndx) )
-					#foreach( $suggestedValue in $suggestedValues )
-						["$!encoder.jsonEncode( ${suggestedValue} )"]
-						#if( $velocityCount < $suggestedValues.size() ),#end
-					#end],
-		"name": "$col.name",
-		"hidden": "$col.hidden"
-    }#if( $velocityCount < $noHeader ),#end
-	#set($index = $index + 1)
-	#end
+  #set($index = 0)
+  #foreach( $col in $grid.getHeaders() )
+  {
+    #set( $mapIndx = $index - $metaData  )
+    "xtype": #if( $mapSuggestedValues.get($mapIndx) && $index > $metaData && $mapSuggestedValues.get($mapIndx).size() > 0 )"combobox"#else"textfield"#end,
+    "suggested": [#set( $suggestedValues = $mapSuggestedValues.get($mapIndx) )
+    #foreach( $suggestedValue in $suggestedValues )
+    ["$!encoder.jsonEncode( ${suggestedValue} )"]
+	#if( $velocityCount < $suggestedValues.size() ),#end
+    #end],
+    "name": "$col.name",
+    "hidden": "$col.hidden"
+  }#if( $velocityCount < $noHeader ),#end
+  #set($index = $index + 1)
+  #end
 ],
 "items":[
   [
-    #foreach( $col in $grid.getHeaders() )"",#end
+  #foreach( $col in $grid.getHeaders() )"",#end
   ],
   #foreach( $row in $grid.getRows() )
   [
-    #foreach( $col in $row )
-	"$!col"#if( $velocityCount < $noHeader ),#end
-    #end
+  #foreach( $col in $row )
+  "$!col"#if( $velocityCount < $noHeader ),#end
+  #end
   ]#if( $velocityCount < $noRows ),#end
   #end
  ]