dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10129
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-03-11 13:47:10 +0700
message:
  Minor fix for program statistics ui.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReport.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/statisticalProgramReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReport.vm	2013-03-08 08:47:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReport.vm	2013-03-11 06:47:10 +0000
@@ -1,7 +1,7 @@
 <h3>$!encoder.htmlEncode( $grid.title )</h3>
 <h5>$grid.subtitle</h5>
 
-	<table class="listTable gridTable" width="150px;">
+	<table class="listTable gridTable">
 		<tbody>
 			#set( $mark = false )
 			#foreach( $row in $grid.getRows() )
@@ -11,14 +11,18 @@
 					#set( $mark = !$mark )
 				#end
 				#foreach( $col in $row )
-					#if($rowIdx<6) 
+					#if($rowIdx<6 && $col!='') 
 						<td colspan='3'>$col</td>
-					#elseif($rowIdx == 6)
+					#elseif($rowIdx == 6 && $col!='')
 						<td colspan='3'><h4>$col</h4></td>
 					#elseif($rowIdx == 7)
 						<th>$col</th>
-					#else
-						<td >$col</td>
+					#elseif($rowIdx>7)
+						#if($velocityCount==1)
+						<td>$col</td>
+						#else
+						<td align='center'>$col</td>
+						#end
 					#end
 				#end
 			</tr>