dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18793
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-04-01 15:55:40 +0700
message:
  minor
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.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-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml	2015-02-24 13:16:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml	2015-04-01 08:55:40 +0000
@@ -49,7 +49,7 @@
       <many-to-many column="sourceid" class="org.hisp.dhis.organisationunit.OrganisationUnit"
         foreign-key="fk_dataset_organisationunit" />
     </set>
-	
+
     <set name="sections" order-by="sortorder" inverse="true">
       <cache usage="read-write" />
       <key column="datasetid" />
@@ -57,8 +57,7 @@
     </set>
 
     <many-to-one name="categoryCombo" class="org.hisp.dhis.dataelement.DataElementCategoryCombo"
-      column="categorycomboid"
-      foreign-key="fk_dataset_categorycomboid" />
+      column="categorycomboid" foreign-key="fk_dataset_categorycomboid" />
 
     <many-to-one name="dataEntryForm" class="org.hisp.dhis.dataentryform.DataEntryForm"
       foreign-key="fk_dataset_dataentryform" cascade="all" />
@@ -76,24 +75,24 @@
     <many-to-one name="notificationRecipients" class="org.hisp.dhis.user.UserGroup"
       foreign-key="fk_dataset_notificationrecipients" />
 
-      <property name="notifyCompletingUser" />
-
-      <property name="approveData" />
-
-      <!-- Form properties -->
+    <property name="notifyCompletingUser" />
+
+    <property name="approveData" />
+
+    <!-- Form properties -->
 
     <property name="allowFuturePeriods" />
 
     <property name="fieldCombinationRequired" />
 
     <property name="validCompleteOnly" />
-    
+
     <property name="noValueRequiresComment" />
 
     <property name="skipOffline" />
 
     <property name="dataElementDecoration" />
-    
+
     <property name="renderAsTabs" />
 
     <property name="renderHorizontally" />

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml	2014-09-16 16:40:46 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml	2015-04-01 08:55:40 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
-    [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-    >
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.dataset.Section" table="section">
@@ -16,19 +16,19 @@
     &identifiableProperties;
 
     <property name="name" column="name" not-null="true" length="230"
-        unique-key="key_sectionnamedataset" />
+      unique-key="key_sectionnamedataset" />
 
     <property name="description" type="text" />
 
     <many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" column="datasetid"
-        unique-key="key_sectionnamedataset" foreign-key="fk_section_datasetid" not-null="true" />
+      unique-key="key_sectionnamedataset" foreign-key="fk_section_datasetid" not-null="true" />
 
     <list name="dataElements" table="sectiondataelements">
       <cache usage="read-write" />
       <key column="sectionid" foreign-key="fk_sectiondataelements_sectionid" />
       <list-index column="sort_order" base="1" />
       <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
-          foreign-key="fk_section_dataelementid" />
+        foreign-key="fk_section_dataelementid" />
     </list>
 
     <list name="indicators" table="sectionindicators">
@@ -36,14 +36,14 @@
       <key column="sectionid" foreign-key="fk_sectionindicators_sectionid" />
       <list-index column="sort_order" base="1" />
       <many-to-many class="org.hisp.dhis.indicator.Indicator" column="indicatorid"
-          foreign-key="fk_section_indicatorid" />
+        foreign-key="fk_section_indicatorid" />
     </list>
 
     <set name="greyedFields" table="sectiongreyedfields">
       <cache usage="read-write" />
       <key column="sectionid" foreign-key="fk_sectiongreyedfields_sectionid" />
       <many-to-many class="org.hisp.dhis.dataelement.DataElementOperand" column="dataelementoperandid"
-          foreign-key="fk_section_dataelementoperandid" />
+        foreign-key="fk_section_dataelementoperandid" />
     </set>
 
     <property name="sortOrder" column="sortorder" not-null="true" />