dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14806
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-04-12 13:07:54 +0800
message:
  The manual aggregation result has wrong headers for the report .
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.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/caseAggregationResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm	2014-03-21 09:29:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm	2014-04-12 05:07:54 +0000
@@ -8,7 +8,7 @@
 
 #set($divIdx=0)
 #set($hashValues=false)
-#foreach( $grid in $grids )
+#foreach( $grid in $grids )  
 	#if($grid.getRows().size() > 0)
 	#set($hashValues=true)
 	#set($divIdx=$divIdx+1)
@@ -24,9 +24,7 @@
 			<tr>
 				<th><input type='checkbox' onchange="toogleAllCheckBoxes( '$divIdx', this.checked );"></th>
 				#foreach( $header in $grid.getVisibleHeaders() )
-					#if($velocityCount!=2)
-						<th #if( $header.meta ) style="text-align:left" #end>$!encoder.htmlEncode( $header.name )</th>
-					#end
+					<th #if( $header.meta ) style="text-align:left" #end>$!encoder.htmlEncode( $header.name )</th>
 				#end
 				<th>$i18n.getString('operator')</th>
 			</tr>
@@ -46,21 +44,15 @@
 							#set($organisationunitid=$col)
 						#elseif($velocityCount==7)
 							#set($periodid=$col)
-						#elseif($velocityCount==$row.size())
-							#set($value=$col)
 						#end
-						#set($item=$dataelementid + '_' + $categoryoptioncomboid + '_' + $periodid + '_' + $organisationunitid + '_' + $value)
 					#end
+					#set($item=$dataelementid + '_' + $categoryoptioncomboid + '_' + $periodid + '_' + $organisationunitid + '_' + $value)
 					<td>
 						<input type='checkbox' name='aggregateValues' value='$item'>
 					</td>
 					
-					#foreach( $col in $row )
-						#if($velocityCount == 7)
-							<td>$col
-						#elseif($velocityCount==8) 
-							$col</td>
-						#elseif( $velocityCount > 8 )
+					#foreach( $col in $row )	
+						#if( $velocityCount > 7 )
 							<td>$col</td> 
 						#end
 					#end