=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateDrillDownResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateDrillDownResultAction.java 2010-08-09 05:27:55 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateDrillDownResultAction.java 2010-08-11 10:38:04 +0000
@@ -266,7 +266,7 @@
wCellformat1.setAlignment( Alignment.CENTRE );
wCellformat1.setVerticalAlignment( VerticalAlignment.CENTRE );
wCellformat1.setWrap( true );
- wCellformat1.setBackground( Colour.GRAY_25 );
+ wCellformat1.setBackground( Colour.GREY_40_PERCENT );
//
int count1 = 0;
@@ -277,10 +277,19 @@
count1++;
}
sheet0.addCell( new Label( 7 + count1, 1, "Execution Date", wCellformat1 ) );
+
+ for( int i=levelsList.size()-1;i>=0;i-- )
+ {
+ int level = levelsList.get(i);
+ count1++;
+ sheet0.addCell( new Label(7+count1 , 1, organisationUnitService.getOrganisationUnitLevelByLevel(level).getName(), wCellformat1 ) );
+ }
+
//
int rowNo = rowList.get( 0 );
+ int srno = 0;
//
for ( OrganisationUnit ou : orgUnitDataList ) {
List pdvList = ouPatientDataValueMap.get( ou );
@@ -371,7 +380,7 @@
//
if ( sType.equalsIgnoreCase( "srno" ) )
{
- int tempNum = 1 + rowCount;
+ int tempNum = 1 + srno;
tempStr = String.valueOf( tempNum );
}
//
@@ -421,6 +430,7 @@
}
//
rowNo++;
+ srno++;
}
//
}