← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13623: Add sort-order property for ProgramPatientAttribute and ProgramPatientIdentifierType object

 

------------------------------------------------------------
revno: 13623
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-01-07 23:46:06 +0700
message:
  Add sort-order property for ProgramPatientAttribute and ProgramPatientIdentifierType object
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml
  dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientIdentifierType.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-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml	2014-01-07 08:22:52 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml	2014-01-07 16:46:06 +0000
@@ -15,5 +15,7 @@
 	
 	<property name="displayedInList"/>
 
+	<property name="sortOrder" column="sort_order" />
+	
   </class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientIdentifierType.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientIdentifierType.hbm.xml	2014-01-07 15:14:19 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientIdentifierType.hbm.xml	2014-01-07 16:46:06 +0000
@@ -4,16 +4,20 @@
   "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.program.ProgramPatientIdentifierType" table="program_identifierTypes">
-
-    <composite-id>
-      <key-many-to-one name="program" class="org.hisp.dhis.program.Program" column="programid"
-        foreign-key="fk_programidentifierTypes_programid" />
-      <key-many-to-one name="patientIdentifierType" class="org.hisp.dhis.patient.PatientIdentifierType" column="patientidentifiertypeid"
-        foreign-key="fk_program_patientidentifiertypeid" />
-    </composite-id>
-	
-	<property name="displayedInList"/>
-
-  </class>
+	<class name="org.hisp.dhis.program.ProgramPatientIdentifierType"
+		table="program_identifierTypes">
+
+		<composite-id>
+			<key-many-to-one name="program" class="org.hisp.dhis.program.Program"
+				column="programid" foreign-key="fk_programidentifierTypes_programid" />
+			<key-many-to-one name="patientIdentifierType"
+				class="org.hisp.dhis.patient.PatientIdentifierType" column="patientidentifiertypeid"
+				foreign-key="fk_program_patientidentifiertypeid" />
+		</composite-id>
+
+		<property name="displayedInList" />
+
+		<property name="sortOrder" column="sort_order" />
+
+	</class>
 </hibernate-mapping>