dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5485
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-12-19 20:01:47 +0100
message:
  Changed the names of some properties for xml/json representations for RelativePeriods. Will fix in model later. Added RelativePeriods to ReportTable for the same representations.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/SystemSettingManager.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java


--
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/options/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/SystemSettingManager.java	2011-12-19 16:44:56 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/SystemSettingManager.java	2011-12-19 19:01:47 +0000
@@ -72,7 +72,7 @@
     final int DEFAULT_MAX_NUMBER_OF_ATTEMPTS = 20;
     final int DEFAULT_TIMEFRAME_MINUTES = 1;
     final double DEFAULT_FACTOR_OF_DEVIATION = 2.0;
-    final int DEFAULT_ORGUNITGROUPSET_AGG_LEVEL = 2;    
+    final int DEFAULT_ORGUNITGROUPSET_AGG_LEVEL = 3;    
     final String DEFAULT_GOOGLE_MAPS_API_KEY = "ABQIAAAAut6AhySExnYIXm5s2OFIkxRKNzJ-_9njnryRTbvC6CtrS4sRvRREWnxwlZUa630pLuPf3nD9i4fq9w";
     
     final String AGGREGATION_STRATEGY_REAL_TIME = "real_time";

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java	2011-12-15 17:53:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java	2011-12-19 19:01:47 +0000
@@ -516,8 +516,8 @@
     // Getters & setters
     // -------------------------------------------------------------------------
 
-    @XmlElement
-    @JsonProperty
+    @XmlElement( name = "lastMonth" )
+    @JsonProperty( value = "lastMonth" )
     public boolean isReportingMonth()
     {
         return reportingMonth;
@@ -529,8 +529,8 @@
         return this;
     }
 
-    @XmlElement
-    @JsonProperty
+    @XmlElement( name = "lastBimonth" )
+    @JsonProperty( value = "lastBimonth" )
     public boolean isReportingBimonth()
     {
         return reportingBimonth;
@@ -542,8 +542,8 @@
         return this;
     }
 
-    @XmlElement
-    @JsonProperty
+    @XmlElement( name = "lastQuarter" )
+    @JsonProperty( value = "lastQuarter" )
     public boolean isReportingQuarter()
     {
         return reportingQuarter;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2011-12-19 11:15:40 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2011-12-19 19:01:47 +0000
@@ -983,6 +983,8 @@
         this.doUnits = doUnits;
     }
 
+    @XmlElement( name = "relativePeriods" )
+    @JsonProperty( value = "relativePeriods" )
     public RelativePeriods getRelatives()
     {
         return relatives;