dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5714
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-01-12 14:06:28 +0700
message:
  local vn - Invisible all the hidden columns when preview.
modified:
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties


--
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 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java	2011-12-22 07:43:18 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java	2012-01-12 07:06:28 +0000
@@ -170,9 +170,6 @@
 
         xml.append( WORKBOOK_OPENTAG );
 
-        int i = 0;
-        int j = 0;
-
         for ( Integer sheetNo : collectSheets )
         {
             Sheet sheet = WORKBOOK.getSheetAt( sheetNo - 1 );
@@ -182,24 +179,19 @@
 
             for ( Row row : sheet )
             {
-                j = 0;
-
-                xml.append( "<row number='" + i + "'>" );
+                xml.append( "<row number='" + row.getRowNum() + "'>" );
 
                 for ( Cell cell : row )
                 {
                     if ( cell.getCellType() != Cell.CELL_TYPE_BLANK )
                     {
-                        xml.append( "<col number='" + j + "'>" );
-                        xml.append( "<![CDATA[" + readValueByPOI( i + 1, j + 1, sheet, evaluatorFormula ) + "]]>" );
+                        xml.append( "<col number='" + cell.getColumnIndex() + "'>" );
+                        xml.append( "<![CDATA["
+                            + readValueByPOI( row.getRowNum() + 1, cell.getColumnIndex() + 1, sheet, evaluatorFormula )
+                            + "]]>" );
                         xml.append( "</col>" );
                     }
-
-                    j++;
                 }
-
-                i++;
-
                 xml.append( "</row>" );
             }
             xml.append( "</sheet>" );
@@ -261,7 +253,8 @@
             for ( Cell cell : row )
             {
                 // Remember that empty cells can contain format information
-                if ( (cell.getCellStyle() != null) || cell.getCellType() != Cell.CELL_TYPE_BLANK )
+                if ( (cell.getCellStyle() != null || cell.getCellType() != Cell.CELL_TYPE_BLANK)
+                    && !s.isColumnHidden( cell.getColumnIndex() ) )
                 {
                     xml.append( "<col no='" + cell.getColumnIndex() + "'>" );
                     xml.append( "<data><![CDATA["

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties	2011-12-07 06:50:10 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties	2012-01-12 07:06:28 +0000
@@ -37,6 +37,7 @@
 calculation					= Calculation
 element_optioncombo			= Element with OptionCombo
 expression					= Expression
+extra_expression			= Extra expression
 indicator					= Indicator
 expression_is_null			= Please enter expression \!
 row_is_null					= Please enter row number \!

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties	2011-11-18 04:24:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties	2012-01-12 07:06:28 +0000
@@ -61,6 +61,7 @@
 center=Gi\u1eefa
 periodlisting=Li\u1ec7t k\u00ea theo th\u1eddi gian
 expression=Bi\u1ec3u th\u1ee9c
+extra_expression=Bi\u1ec3u th\u1ee9c ph\u1ee5
 reports=Danh s\u00e1ch b\u00e1o c\u00e1o
 bottom=D\u01b0\u1edbi
 choose_period=Ch\u01b0a ch\u1ecdn th\u1eddi \u0111i\u1ec3m