dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2384
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-10-18 17:13:27 +0700
message:
  Fixed bug when exporting to html for report table.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java


--
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-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2010-08-19 09:43:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2010-10-18 10:13:27 +0000
@@ -566,8 +566,12 @@
                         String prettyColumnName = getPrettyColumnName( indicator, categoryOptionCombo, period, unit );
                         String columnIdentifier = getColumnIdentifier( indicator, categoryOptionCombo, period, unit );
                         
-                        crossTabColumns.add( columnName );
-                        prettyCrossTabColumns.put( columnName, prettyColumnName );
+                        if ( columnName != null && !columnName.isEmpty() )
+                        {
+                            crossTabColumns.add( columnName );
+                            prettyCrossTabColumns.put( columnName, prettyColumnName );    
+                        }
+                        
                         crossTabIdentifiers.add( columnIdentifier );
                     }
                 }