dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11169
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-06-07 15:22:37 +0700
message:
  Merge categoryoptioncombo into dataelement column in Manual person aggregation.
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	2013-05-14 09:24:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm	2013-06-07 08:22:37 +0000
@@ -23,7 +23,9 @@
 			<tr>
 				<th><input type='checkbox' onchange="toogleAllCheckBoxes( '$divIdx', this.checked );"></th>
 				#foreach( $header in $grid.getVisibleHeaders() )
-				<th #if( $header.meta ) style="text-align:left" #end>$!encoder.htmlEncode( $header.name )</th>
+					#if($velocityCount!=2)
+						<th #if( $header.meta ) style="text-align:left" #end>$!encoder.htmlEncode( $header.name )</th>
+					#end
 				#end
 				<th>$i18n.getString('operator')</th>
 			</tr>
@@ -50,7 +52,13 @@
 					</td>
 					
 					#foreach( $col in $row )
-						#if($velocityCount>6) <td>$col</td> #end
+						#if($velocityCount == 7)
+							<td>$col
+						#elseif($velocityCount==8) 
+							$col</td>
+						#elseif( $velocityCount > 8 )
+							<td>$col</td> 
+						#end
 					#end
 					<td>
 						<a href='javascript:viewResultDetails( "$grid.title", $organisationunitid, "$periodid")' title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>