dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13777: Refixed for creating dynamic attrubutes, remove fixed properties of Patient.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sun, 19 Jan 2014 14:10:42 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 13777
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-01-19 21:04:38 +0700
message:
  Refixed for creating dynamic attrubutes, remove fixed properties of Patient.
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-19 13:22:00 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2014-01-19 14:04:38 +0000
@@ -289,7 +289,7 @@
 
         updateCoordinatesProgramStageInstance();
 
-        // addPatientAttributes();
+        addPatientAttributes();
 
         executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsIncidentDate" );
         executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsEnrollmentDate" );
@@ -503,17 +503,14 @@
 
         try
         {
-            String autoIncrVal = statementBuilder.getAutoIncrementValue();
-
-            Statement statement = holder.getStatement();
+           Statement statement = holder.getStatement();
 
             ResultSet resultSet = statement.executeQuery( "SELECT gender FROM patient" );
 
             // Only execute once
             if ( resultSet.next() )
             {
-                Integer max = jdbcTemplate.queryForObject( "select max(patientattributeid) from patientattribute",
-                    Integer.class );
+                String max = statementBuilder.getAutoIncrementValue();
 
                 // ---------------------------------------------------------------------
                 // Gender
@@ -521,7 +518,6 @@
 
                 log.info( "Inserting dynamic atribute called Gender" );
 
-                max++;
                 String uid = CodeGenerator.generateCode();
 
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
@@ -537,21 +533,20 @@
 
                 log.info( "Inserting data into Gender attribute" );
 
-                Integer maxOpt = jdbcTemplate.queryForObject(
-                    "select max(patientattributeoptionid) from patientattributeoption", Integer.class );
-                maxOpt++;
+                String maxOpt = statementBuilder.getAutoIncrementValue();
+                
                 executeSql( "INSERT INTO patientattributeoption (patientattributeoptionid, name, patientattributeid ) VALUES ('"
                     + maxOpt + "', 'F'," + max + ")" );
                 executeSql( "INSERT INTO patientattributevalue (patientid, patientattributeid, value, patientattributeoptionid ) SELECT patientid,"
                     + max + ",'F'," + maxOpt + " from patient where gender='F'" );
 
-                maxOpt++;
+                maxOpt = statementBuilder.getAutoIncrementValue();
                 executeSql( "INSERT INTO patientattributeoption (patientattributeoptionid, name, patientattributeid ) VALUES ('"
                     + maxOpt + "', 'M'," + max + ")" );
                 executeSql( "INSERT INTO patientattributevalue (patientid, patientattributeid, value, patientattributeoptionid ) SELECT patientid,"
                     + max + ",'M'," + maxOpt + " from patient where gender='M'" );
 
-                maxOpt++;
+                maxOpt = statementBuilder.getAutoIncrementValue();
                 executeSql( "INSERT INTO patientattributeoption (patientattributeoptionid, name, patientattributeid ) VALUES ('"
                     + maxOpt + "', 'T'," + max + ")" );
                 executeSql( "INSERT INTO patientattributevalue (patientid, patientattributeid, value, patientattributeoptionid ) SELECT patientid,"
@@ -577,7 +572,7 @@
 
                 log.info( "Inserting dynamic atribute called Death date" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -603,7 +598,7 @@
 
                 log.info( "Inserting dynamic atribute called registration date" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -630,7 +625,7 @@
 
                 log.info( "Inserting dynamic atribute called isDead" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -656,7 +651,7 @@
 
                 log.info( "Inserting dynamic atribute called underAge" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, description, name, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -682,7 +677,7 @@
 
                 log.info( "Inserting dynamic atribute called DobType..." );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, description, name, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -697,19 +692,19 @@
 
                 log.info( "Inserting data into DobType" );
 
-                maxOpt++;
+                maxOpt = statementBuilder.getAutoIncrementValue();
                 executeSql( "INSERT INTO patientattributeoption (patientattributeoptionid, name, patientattributeid ) VALUES ('"
                     + maxOpt + "', 'A'," + max + ")" );
                 executeSql( "INSERT INTO patientattributevalue (patientid, patientattributeid, value, patientattributeoptionid ) SELECT patientid,"
                     + max + ",'A'," + maxOpt + " from patient where dobType='A'" );
 
-                maxOpt++;
+                maxOpt = statementBuilder.getAutoIncrementValue();
                 executeSql( "INSERT INTO patientattributeoption (patientattributeoptionid, name, patientattributeid ) VALUES ('"
                     + maxOpt + "', 'D'," + max + ")" );
                 executeSql( "INSERT INTO patientattributevalue (patientid, patientattributeid, value, patientattributeoptionid ) SELECT patientid,"
                     + max + ",'D'," + maxOpt + " from patient where dobType='D'" );
 
-                maxOpt++;
+                maxOpt = statementBuilder.getAutoIncrementValue();
                 executeSql( "INSERT INTO patientattributeoption (patientattributeoptionid, name, patientattributeid ) VALUES ('"
                     + maxOpt + "', 'V'," + max + ")" );
                 executeSql( "INSERT INTO patientattributevalue (patientid, patientattributeid, value, patientattributeoptionid ) SELECT patientid,"
@@ -731,7 +726,7 @@
 
                 log.info( "Inserting dynamic atribute called Birthdate" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -757,7 +752,7 @@
 
                 log.info( "Inserting dynamic atribute called age" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -792,7 +787,7 @@
 
                 log.info( "Inserting dynamic atribute called Phone number" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max
@@ -817,7 +812,7 @@
 
                 log.info( "Inserting dynamic atribute called Full name" );
 
-                max++;
+                max = statementBuilder.getAutoIncrementValue();
                 uid = CodeGenerator.generateCode();
                 executeSql( "INSERT INTO patientattribute (patientattributeid, uid, lastUpdated, name, description, valueType, mandatory, inherit, displayOnVisitSchedule ) VALUES ("
                     + max