dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4116
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-07-12 12:23:15 +0700
message:
  local vn - minor fixed.
modified:
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/bookmark/action/SaveBookmarkAction.java
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponseImport.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 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/bookmark/action/SaveBookmarkAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/bookmark/action/SaveBookmarkAction.java	2011-05-24 07:48:23 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/bookmark/action/SaveBookmarkAction.java	2011-07-12 05:23:15 +0000
@@ -83,7 +83,10 @@
         this.contain = contain;
     }
 
-    @Override
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+
     public String execute()
         throws Exception
     {

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponseImport.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponseImport.java	2011-06-29 07:29:06 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponseImport.java	2011-07-12 05:23:15 +0000
@@ -129,6 +129,8 @@
 
             for ( int j = 0; j < cell.length; j++ )
             {
+                run = 0;
+                
                 // Remember that empty cells can contain format information
                 if ( !cell[j].getType().equals( CellType.EMPTY ) || (cell[j].getCellFormat() != null) )
                 {
@@ -139,11 +141,7 @@
                         if ( (importItem.getSheetNo() == sheetNo) && (importItem.getRow() == (i + 1))
                             && (importItem.getColumn() == (j + 1)) )
                         {
-                            if ( TYPE.equals( ExcelItemGroup.TYPE.NORMAL ) )
-                            {
-                                xml.append( " id='" + importItem.getExpression() + "'>" );
-                            }
-                            else if ( TYPE.equals( ExcelItemGroup.TYPE.CATEGORY ) )
+                            if ( TYPE.equals( ExcelItemGroup.TYPE.NORMAL ) || TYPE.equals( ExcelItemGroup.TYPE.CATEGORY ) )
                             {
                                 xml.append( " id='" + importItem.getExpression() + "'>" );
                             }
@@ -155,7 +153,7 @@
                     }
 
                     if ( run == importItems.size() )
-                    {
+                    {                        
                         xml.append( ">" );
                     } // end checking