dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1017
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2009-11-10 16:20:36 +0700
message:
  Quickly fixed
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.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-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.java	2009-11-09 08:02:08 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.java	2009-11-10 09:20:36 +0000
@@ -468,58 +468,35 @@
 
     private void recalculatedValueForCellFormula( org.apache.poi.ss.usermodel.Workbook wb, int sheetNo )
     {
-
-        Cell[] cell = null;
-        Sheet s = WORKBOOK.getSheet( sheetNo );
-
         org.apache.poi.ss.usermodel.Sheet sheet = wb.getSheetAt( sheetNo );
         org.apache.poi.ss.usermodel.FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
 
-        String recalculatedValue = "0";
-
-        for ( int i = 0; i < s.getRows(); i++ )
-        {
-            STRUCTURE_DATA_RESPONSE.append( "    <row index=\"" + i + "\">" );
-            STRUCTURE_DATA_RESPONSE.append( PRINT_END_LINE );
-
-            cell = s.getRow( i );
-
-            for ( int j = 0; j < cell.length; j++ )
-            {
-
-                if ( cell[j].getType() == CellType.NUMBER_FORMULA || cell[j].getType() == CellType.STRING_FORMULA
-                    || cell[j].getType() == CellType.BOOLEAN_FORMULA || cell[j].getType() == CellType.DATE_FORMULA
-                    || cell[j].getType() == CellType.FORMULA_ERROR )
+        String recalculatedValue = "";
+		
+        for (org.apache.poi.ss.usermodel.Row rowPOI : sheet) {
+            
+            for (org.apache.poi.ss.usermodel.Cell cellPOI : rowPOI) {
+                
+                if (cellPOI.getCellType() == org.apache.poi.ss.usermodel.Cell.CELL_TYPE_FORMULA)
                 {
-
-                    // suppose your formula is in Cell
-                    org.apache.poi.ss.util.CellReference cellReference = new org.apache.poi.ss.util.CellReference(
-                        cell[j].getRow(), cell[j].getColumn() );
-                    org.apache.poi.ss.usermodel.Row rowPOI = sheet.getRow( cellReference.getRow() );
-                    org.apache.poi.ss.usermodel.Cell cellPOI = rowPOI.getCell( cellReference.getCol() );
-
-                    if ( cellPOI != null )
+                    switch ( evaluator.evaluateFormulaCell( cellPOI ) )
                     {
-                        switch ( evaluator.evaluateFormulaCell( cellPOI ) )
+                    case org.apache.poi.ss.usermodel.Cell.CELL_TYPE_NUMERIC:
+
+                        recalculatedValue = String.valueOf( cellPOI.getNumericCellValue() );
+                        
+                        if ( new Double( recalculatedValue.split( "\\." )[1] ) == 0.0d )
                         {
-                        case org.apache.poi.ss.usermodel.Cell.CELL_TYPE_NUMERIC:
-
-                            recalculatedValue = String.valueOf( cellPOI.getNumericCellValue() );
-
-                            if ( new Integer( recalculatedValue.split( "\\." )[1] ) == 0 )
-                            {
-
-                                recalculatedValue = recalculatedValue.split( "\\." )[0];
-                            }
-
-                            ExcelUtils.writeValueByPOI( i, j, recalculatedValue, ExcelUtils.NUMBER, (HSSFSheet) sheet,
-                                (HSSFCellStyle) wb.createCellStyle() );
-                            break;
-
-                        // CELL_TYPE_FORMULA will never occur
-                        case org.apache.poi.ss.usermodel.Cell.CELL_TYPE_FORMULA:
-                            break;
+                            recalculatedValue = recalculatedValue.split( "\\." )[0];
                         }
+                        
+                        ExcelUtils.writeValueByPOI( cellPOI.getRowIndex(), cellPOI.getColumnIndex(), recalculatedValue, ExcelUtils.NUMBER, (HSSFSheet) sheet,
+                            (HSSFCellStyle) wb.createCellStyle() );
+                        break;
+
+                    // CELL_TYPE_FORMULA will never occur
+                    case org.apache.poi.ss.usermodel.Cell.CELL_TYPE_FORMULA:
+                        break;
                     }
                 }
             }