dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3852
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-06-07 15:52:04 +0200
message:
  Added new property to Configuration
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.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/configuration/Configuration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java	2011-06-01 15:32:01 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java	2011-06-07 13:52:04 +0000
@@ -30,6 +30,7 @@
 import java.io.Serializable;
 
 import org.hisp.dhis.dataelement.DataElementGroup;
+import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.user.UserGroup;
 
 /**
@@ -49,6 +50,8 @@
 
     private DataElementGroup infrastructuralDataElements;
     
+    private PeriodType infrastructuralPeriodType;
+    
     public Configuration()
     {
     }
@@ -82,4 +85,14 @@
     {
         this.infrastructuralDataElements = infrastructuralDataElements;
     }
+
+    public PeriodType getInfrastructuralPeriodType()
+    {
+        return infrastructuralPeriodType;
+    }
+
+    public void setInfrastructuralPeriodType( PeriodType infrastructuralPeriodType )
+    {
+        this.infrastructuralPeriodType = infrastructuralPeriodType;
+    }
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java	2011-05-05 21:14:56 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java	2011-06-07 13:52:04 +0000
@@ -223,9 +223,9 @@
      * @param period
      * @return the period as string
      */
-    public abstract String getIsoDate(Period period);
+    public abstract String getIsoDate( Period period );
 
-    public abstract Period createPeriod(String isoDate);
+    public abstract Period createPeriod( String isoDate );
 
     public abstract String getIsoFormat();
     

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2011-06-07 12:43:08 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2011-06-07 13:52:04 +0000
@@ -15,6 +15,9 @@
 
 	<many-to-one name="infrastructuralDataElements" class="org.hisp.dhis.dataelement.DataElementGroup" 
 		column="infrastructuraldataelementsid" foreign-key="fk_configuration_infrastructural_dataelements"/>
+		
+	<many-to-one name="infrastructuralPeriodType" class="org.hisp.dhis.period.PeriodType"
+		column="infrastructuralperiodtypeid" foreign-key="fk_configuration_infrastructural_periodtype"/>
 
   </class>
 </hibernate-mapping>