dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13481
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-30 11:08:00 +0100
message:
  proper fix for batch-handlers
modified:
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.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/DataElementGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java	2013-12-30 10:08:00 +0000
@@ -90,6 +90,9 @@
         statementBuilder.setColumn( "uid" );
         statementBuilder.setColumn( "code" );
         statementBuilder.setColumn( "name" );
+        statementBuilder.setColumn( "description" );
+        statementBuilder.setColumn( "compulsory" );
+        statementBuilder.setColumn( "datadimension" );
     }
     
     protected void setValues( DataElementGroupSet groupSet )
@@ -97,5 +100,8 @@
         statementBuilder.setValue( groupSet.getUid() );        
         statementBuilder.setValue( groupSet.getCode() );        
         statementBuilder.setValue( groupSet.getName() );        
+        statementBuilder.setValue( groupSet.getDescription() );
+        statementBuilder.setValue( groupSet.isCompulsory() );
+        statementBuilder.setValue( groupSet.isDataDimension() );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java	2013-12-30 10:01:31 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java	2013-12-30 10:08:00 +0000
@@ -92,7 +92,7 @@
         statementBuilder.setColumn( "name" );
         statementBuilder.setColumn( "description" );
         statementBuilder.setColumn( "compulsory" );
-        statementBuilder.setColumn( "dataDimension" );
+        statementBuilder.setColumn( "datadimension" );
     }
     
     protected void setValues( OrganisationUnitGroupSet groupSet )