dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10614
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-04-18 16:21:21 +0700
message:
  Minor fix.
modified:
  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/resources/org/hisp/dhis/program/hibernate/ProgramStage.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/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	2013-04-18 06:45:36 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2013-04-18 09:21:21 +0000
@@ -211,7 +211,6 @@
         updateProgramInstanceStatus();
         
         executeSql( "UPDATE program SET disableRegistrationFields=false where disableRegistrationFields is null" );
-        executeSql( "ALTER TABLE programstage DROP CONSTRAINT \"programstage_name_key\"");
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2013-04-18 06:45:36 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2013-04-18 09:21:21 +0000
@@ -6,52 +6,56 @@
   >
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.program.ProgramStage" table="programstage">
-
-    <id name="id" column="programstageid">
-      <generator class="native" />
-    </id>
-    &identifiableProperties;
-
-    <property name="name" column="name" not-null="true" length="230" />
-
-    <property name="description" />
-
-    <property name="minDaysFromStart" column="mindaysfromstart" not-null="true" />
-
-    <many-to-one name="program" class="org.hisp.dhis.program.Program" column="programid" foreign-key="fk_programstage_program" />
-
-    <property name="irregular" column="irregular" />
-
-    <set name="programStageDataElements" order-by="sort_order">
-      <key column="programstageid" />
-      <one-to-many class="org.hisp.dhis.program.ProgramStageDataElement" />
-    </set>
-
-    <many-to-one name="dataEntryForm" class="org.hisp.dhis.dataentryform.DataEntryForm"
-      foreign-key="fk_programstage_dataentryform" />
-
-    <property name="standardInterval" />
-
-    <set name="programStageSections" order-by="sortOrder" cascade="all">
-      <key column="programStageid" />
-      <one-to-many class="org.hisp.dhis.program.ProgramStageSection" />
-    </set>
-
-    <property name="reportDateDescription" />
-
-    <set name="patientReminders" order-by="daysAllowedSendMessage" cascade="all">
-      <key column="programStageid" />
-      <one-to-many class="org.hisp.dhis.patient.PatientReminder" />
-    </set>
-
-    <property name="autoGenerateEvent" />
-
-    <property name="validCompleteOnly" />
-
-    <property name="displayGenerateEventBox" />
-    
-    <property name="captureCoordinates" />
-
-  </class>
+	<class name="org.hisp.dhis.program.ProgramStage" table="programstage">
+
+		<id name="id" column="programstageid">
+			<generator class="native" />
+		</id>
+
+	    &identifiableProperties;
+
+		<property name="name" column="name" length="230" />
+
+		<property name="description" />
+
+		<property name="minDaysFromStart" column="mindaysfromstart"
+			not-null="true" />
+
+		<many-to-one name="program" class="org.hisp.dhis.program.Program"
+			column="programid" foreign-key="fk_programstage_program" />
+
+		<property name="irregular" column="irregular" />
+
+		<set name="programStageDataElements" order-by="sort_order">
+			<key column="programstageid" />
+			<one-to-many class="org.hisp.dhis.program.ProgramStageDataElement" />
+		</set>
+
+		<many-to-one name="dataEntryForm"
+			class="org.hisp.dhis.dataentryform.DataEntryForm" foreign-key="fk_programstage_dataentryform" />
+
+		<property name="standardInterval" />
+
+		<set name="programStageSections" order-by="sortOrder" cascade="all">
+			<key column="programStageid" />
+			<one-to-many class="org.hisp.dhis.program.ProgramStageSection" />
+		</set>
+
+		<property name="reportDateDescription" />
+
+		<set name="patientReminders" order-by="daysAllowedSendMessage"
+			cascade="all">
+			<key column="programStageid" />
+			<one-to-many class="org.hisp.dhis.patient.PatientReminder" />
+		</set>
+
+		<property name="autoGenerateEvent" />
+
+		<property name="validCompleteOnly" />
+
+		<property name="displayGenerateEventBox" />
+
+		<property name="captureCoordinates" />
+
+	</class>
 </hibernate-mapping>