dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13776
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-01-19 20:22:00 +0700
message:
  Create uid for Aggregate query builder formulas when to start tomcat.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.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-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2014-01-17 12:59:03 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2014-01-19 13:22:00 +0000
@@ -289,7 +289,7 @@
 
         updateCoordinatesProgramStageInstance();
 
-        //addPatientAttributes();
+        // addPatientAttributes();
 
         executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsIncidentDate" );
         executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsEnrollmentDate" );
@@ -346,6 +346,7 @@
         updateUidColumn( "programstage" );
         updateUidColumn( "programstagesection" );
         updateUidColumn( "programvalidation" );
+        updateUidColumn( "caseaggregatecondition" );
     }
 
     private void updateUidColumn( String tableName )
@@ -505,7 +506,7 @@
             String autoIncrVal = statementBuilder.getAutoIncrementValue();
 
             Statement statement = holder.getStatement();
-                        
+
             ResultSet resultSet = statement.executeQuery( "SELECT gender FROM patient" );
 
             // Only execute once
@@ -815,8 +816,8 @@
                 // -------------------------------------------------------------
 
                 log.info( "Inserting dynamic atribute called Full name" );
-               
-                max ++;
+
+                max++;
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max