dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9939
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-03-01 09:54:22 +0100
message:
  Updated batchhandlers with new group properties
modified:
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java
  dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.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-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java	2013-03-01 08:54:22 +0000
@@ -89,12 +89,14 @@
         statementBuilder.setColumn( "uid" );
         statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
+        statementBuilder.setColumn( "shortname" );
     }
     
     protected void setValues( DataElementGroup group )
     {
         statementBuilder.setValue( group.getUid() );        
         statementBuilder.setValue( group.getCode() );        
-        statementBuilder.setValue( group.getName() );        
+        statementBuilder.setValue( group.getName() );
+        statementBuilder.setValue( group.getShortName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java	2013-03-01 08:54:22 +0000
@@ -89,6 +89,7 @@
         statementBuilder.setColumn( "uid" );
         statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
+        statementBuilder.setColumn( "shortname" );
     }
     
     protected void setValues( OrganisationUnitGroup group )
@@ -96,5 +97,6 @@
         statementBuilder.setValue( group.getUid() );
         statementBuilder.setValue( group.getCode() );
         statementBuilder.setValue( group.getName() );
+        statementBuilder.setValue( group.getShortName() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2013-01-07 14:31:20 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2013-03-01 08:54:22 +0000
@@ -477,6 +477,8 @@
 
         group.setUid( BASE_UID + uniqueCharacter );
         group.setName( "DataElementGroup" + uniqueCharacter );
+        group.setShortName( "DataElementGroup" + uniqueCharacter );
+        group.setCode( "DataElementCode" + uniqueCharacter );
 
         return group;
     }
@@ -629,6 +631,8 @@
 
         group.setUid( BASE_UID + uniqueCharacter );
         group.setName( "OrganisationUnitGroup" + uniqueCharacter );
+        group.setShortName( "OrganisationUnitGroupShort" + uniqueCharacter );
+        group.setCode( "OrganisationUnitGroupCode" + uniqueCharacter );
 
         return group;
     }