dhis2-devs team mailing list archive

[Leandro Soares <lssoares@xxxxxxxxxxxxxxxxxxxx>]

Leandro Soares has proposed merging lp:~sis-ma/dhis2/SISMA-338 into lp:dhis2.

Requested reviews:
  DHIS 2 core developers (dhis2-devs-core)
Related bugs:
  Bug #1234222 in DHIS: "Data values not visible in Reports->Data Set Report-> Download as PDF/Excel"
  https://bugs.launchpad.net/dhis2/+bug/1234222

For more details, see:
https://code.launchpad.net/~sis-ma/dhis2/SISMA-338/+merge/189306
-- 
https://code.launchpad.net/~sis-ma/dhis2/SISMA-338/+merge/189306
Your team DHIS 2 developers is subscribed to branch lp:dhis2.

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java	2013-10-04 13:17:41 +0000
@@ -572,7 +572,18 @@
      */
     public static String getValue( TagNode cell )
     {
-        return cell.getFirstChild() != null ? cell.getFirstChild().getText().trim().replaceAll( " ", EMPTY ) : EMPTY;
+        String master = new String(EMPTY);
+        for (Node child : cell.getChildren().toNodeArray())
+        {
+            if (child instanceof Span) {
+               master = master + ((Span)child).getStringText().trim().replaceAll( " ", EMPTY );
+            }
+            else
+            {
+                master = master + child.getText().trim().replaceAll( " ", EMPTY );
+            }
+        }
+        return master;
     }
     
     // -------------------------------------------------------------------------