dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13790
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-01-20 23:09:20 +0700
message:
   Change from Boolean objects to boolean primitives in tracker model  (update TableAlteror).
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttribute.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/SchedulingProgramObject.java
  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-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java	2014-01-07 19:37:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java	2014-01-20 16:09:20 +0000
@@ -52,7 +52,7 @@
     private String accessedModule;
 
     // -------------------------------------------------------------------------
-    // Constructor
+    // Constructors
     // -------------------------------------------------------------------------
 
     public PatientAudit()
@@ -68,8 +68,8 @@
         this.accessedModule = accessedModule;
     }
 
-    //TODO implement hashCode and equals
-    
+    // TODO implement hashCode and equals
+
     // -------------------------------------------------------------------------
     // Getters && Setters
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java	2013-11-18 11:50:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java	2014-01-20 16:09:20 +0000
@@ -58,6 +58,10 @@
 
     private String identifier;
 
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
     public PatientIdentifier()
     {
         setAutoFields();
@@ -80,9 +84,9 @@
     {
         final int prime = 31;
         int result = super.hashCode();
-        result = prime * result + ( ( identifierType == null) ? 0 : identifierType.hashCode() );
-        result = prime * result + ( ( patient == null) ? 0 : patient.hashCode() );
-        result = prime * result + ( ( identifier == null) ? 0 : identifier.hashCode() );
+        result = prime * result + ((identifierType == null) ? 0 : identifierType.hashCode());
+        result = prime * result + ((patient == null) ? 0 : patient.hashCode());
+        result = prime * result + ((identifier == null) ? 0 : identifier.hashCode());
         return result;
     }
 
@@ -93,19 +97,19 @@
         {
             return true;
         }
-        
+
         if ( !super.equals( object ) )
         {
             return false;
         }
-        
+
         if ( getClass() != object.getClass() )
         {
             return false;
         }
-        
+
         final PatientIdentifier other = (PatientIdentifier) object;
-        
+
         if ( identifierType == null )
         {
             if ( other.identifierType != null )
@@ -117,7 +121,7 @@
         {
             return false;
         }
-        
+
         if ( patient == null )
         {
             if ( other.patient != null )
@@ -141,7 +145,7 @@
         {
             return false;
         }
-        
+
         return true;
     }
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttribute.java	2014-01-16 07:34:15 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramPatientAttribute.java	2014-01-20 16:09:20 +0000
@@ -59,7 +59,6 @@
 
     private boolean displayedInList;
 
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/SchedulingProgramObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/SchedulingProgramObject.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/SchedulingProgramObject.java	2014-01-20 16:09:20 +0000
@@ -43,6 +43,10 @@
 
     private String message;
 
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
     public SchedulingProgramObject()
     {
 
@@ -55,6 +59,10 @@
         this.message = message;
     }
 
+    // -------------------------------------------------------------------------
+    // Getters and setters
+    // -------------------------------------------------------------------------
+
     public String getPhoneNumber()
     {
         return phoneNumber;

=== 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-20 09:32:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2014-01-20 16:09:20 +0000
@@ -230,8 +230,6 @@
         executeSql( "UPDATE program SET useFormNameDataElement=true where useFormNameDataElement is null" );
         executeSql( "ALTER TABLE caseaggregationcondition ALTER COLUMN aggregationexpression TYPE varchar(1000)" );
         executeSql( "update patientattribute set displayonvisitschedule = false where displayonvisitschedule is null" );
-        executeSql( "update program set useBirthDateAsIncidentDate = false where useBirthDateAsIncidentDate is null" );
-        executeSql( "update program set useBirthDateAsEnrollmentDate = false where useBirthDateAsEnrollmentDate is null" );
         executeSql( "update program set selectEnrollmentDatesInFuture = false where selectEnrollmentDatesInFuture is null" );
         executeSql( "update program set selectIncidentDatesInFuture = false where selectIncidentDatesInFuture is null" );
         executeSql( "update validationcriteria set description = name where description is null or description='' " );
@@ -255,7 +253,6 @@
         executeSql( "DROP TABLE patient_attributes" );
 
         executeSql( "update programstage set openAfterEnrollment=false where openAfterEnrollment is null" );
-        executeSql( "update programstage set reportDateToUse=false where reportDateToUse is null" );
 
         executeSql( "update patientidentifiertype set orgunitScope=false where orgunitScope is null" );
         executeSql( "update patientidentifiertype set programScope=false where programScope is null" );
@@ -298,6 +295,9 @@
         executeSql( "ALTER TABLE patientidentifiertype DROP COLUMN persondisplayname" );
 
         updateProgramAttributes();
+        
+        executeSql( "UPDATE program SET displayIncidentDate=false WHERE displayIncidentDate is null" );
+        executeSql( "UPDATE program SET relationshipFromA=false WHERE relationshipFromA is null" );
     }
 
     // -------------------------------------------------------------------------