dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8446
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-09 14:49:13 +0700
message:
  local vn - Fixed bug
modified:
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/organisationunit/action/AddMultiOrganisationUnitAction.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-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java	2012-10-02 04:32:52 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java	2012-10-09 07:49:13 +0000
@@ -356,6 +356,7 @@
 
                 rowBegin++;
                 totalValue += value;
+                value = 0;
             }
 
             if ( reportItem.getItemType().equalsIgnoreCase( ExportItem.TYPE.DATAELEMENT ) )

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/organisationunit/action/AddMultiOrganisationUnitAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/organisationunit/action/AddMultiOrganisationUnitAction.java	2012-09-19 02:22:55 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/organisationunit/action/AddMultiOrganisationUnitAction.java	2012-10-09 07:49:13 +0000
@@ -55,8 +55,6 @@
 public class AddMultiOrganisationUnitAction
     implements Action
 {
-    private static final String SEPERATE = " - ";
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
@@ -172,8 +170,6 @@
         // Create organization unit
         // ---------------------------------------------------------------------
 
-        String extraName = (parent.getCode() == null ? String.valueOf( parent.getId() ) : parent.getCode());
-
         for ( String id : selectedList )
         {
             OrganisationUnitPrototype unitPrototype = organisationUnitPrototypeService
@@ -181,8 +177,7 @@
 
             if ( unitPrototype != null )
             {
-                OrganisationUnit organisationUnit = new OrganisationUnit( unitPrototype.getDisplayName() + SEPERATE
-                    + extraName, unitPrototype.getDisplayShortName(), null, date, null, active, null );
+                OrganisationUnit organisationUnit = new OrganisationUnit( unitPrototype.getDisplayName(), unitPrototype.getDisplayShortName(), null, date, null, active, null );
 
                 organisationUnit.setParent( parent );