dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24571
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12072: minor fix
------------------------------------------------------------
revno: 12072
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-09-13 10:55:14 +0200
message:
minor fix
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeOption.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml
--
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/PatientAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java 2013-09-11 15:26:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java 2013-09-13 08:55:14 +0000
@@ -42,7 +42,6 @@
/**
* @author Abyot Asalefew
- * @version $Id$
*/
@JacksonXmlRootElement( localName = "patientAttribute", namespace = DxfNamespaces.DXF_2_0 )
public class PatientAttribute
@@ -86,6 +85,7 @@
public PatientAttribute()
{
+ setAutoFields();
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeOption.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeOption.java 2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeOption.java 2013-09-13 08:55:14 +0000
@@ -32,8 +32,6 @@
/**
* @author Viet
- *
- * @version $Id$
*/
public class PatientAttributeOption implements Serializable
{
@@ -43,11 +41,11 @@
private static final long serialVersionUID = 9052641474847384010L;
private int id;
-
+
private String name;
-
+
private PatientAttribute patientAttribute;
-
+
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
@@ -59,7 +57,7 @@
// -------------------------------------------------------------------------
// hashCode, equals and toString
// -------------------------------------------------------------------------
-
+
@Override
public int hashCode()
{
@@ -99,7 +97,6 @@
// Getters and setters
// -------------------------------------------------------------------------
-
public int getId()
{
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml 2013-06-05 04:17:53 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml 2013-09-13 08:55:14 +0000
@@ -34,9 +34,9 @@
<property name="inherit" column="inherit" />
<property name="expression" column="expression" />
-
+
<property name="displayOnVisitSchedule" />
-
+
<property name="sortOrderInVisitSchedule" />
</class>